From bce02cf445b26334ed6dace3cafe5dacfd76d6c9 Mon Sep 17 00:00:00 2001 From: leo <426742@gmail.com> Date: Thu, 8 Aug 2024 06:32:17 +0500 Subject: [PATCH] fixes --- install.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index f5e8a17..e5f024f 100644 --- a/install.sh +++ b/install.sh @@ -25,7 +25,7 @@ fi # source $SECRETS_STORE #fi -trap 'echo -e "\033[31mSomething went wrong\033[0m"; exit 1' EXIT +trap 'echo -e "\033[31minstall.sh: Something went wrong\033[0m"; exit 1' EXIT set -e export DEBIAN_FRONTEND=noninteractive @@ -33,23 +33,27 @@ export DEBIAN_FRONTEND=noninteractive DOMAIN=$1 #$SERVER_TYPE=dev -mkdir -p /data -chown usradmin:usradmin /data -chmod 770 /data +#mkdir -p /data +#chown usradmin:usradmin /data +#chmod 770 /data #cd /data #git clone git@$GIT_SSH_DOMAIN:$GIT_USER/utils.git cd /data/utils #bash init-server.sh + +echo "Install docker..." bash init-docker.sh +echo "Creating docker network proxynet..." docker network create proxynet # SSH config: #bash ssh-port.sh $SSHPORT #ssh-keygen -t ed25519 -C "$ADMINEMAIL" -bash cron-list.sh +#echo "Init cron list..." +#bash cron-list.sh # create global environment vars: bash global-env.sh SERVER_DOMAIN $DOMAIN @@ -59,6 +63,8 @@ bash global-env.sh TRAEFIK_LOG_LEVEL $TRAEFIKLOGLEVEL bash global-env.sh ADMIN_EMAIL $ADMINEMAIL bash global-env.sh SRV_START_DIR $STARTDIR +echo "Init cron list..." +bash cron-list.sh #bash global-env.sh SERVER_TYPE $SERVER_TYPE