Browse Source

fixed caddy start/stop

Tobias Cudnik 2 years ago
parent
commit
a17a4530de
2 changed files with 4 additions and 4 deletions
  1. 1 1
      scripts/nm-certs.sh
  2. 3 3
      scripts/nm-quick.sh

+ 1 - 1
scripts/nm-certs.sh

@@ -92,7 +92,7 @@ echo "SSL certificates ready"
 # preserve the env state
 if [ "$RESTART_CADDY" = true ]; then
 	echo "Starting Caddy..."
-	docker-compose -f /root/docker-compose.yml start caddy --force-recreate
+	docker-compose -f /root/docker-compose.yml start caddy
 fi
 
 # install crontab

+ 3 - 3
scripts/nm-quick.sh

@@ -640,9 +640,6 @@ install_netmaker() {
 		wget -qO /root/wait.sh "https://raw.githubusercontent.com/gravitl/netmaker/$BUILD_TAG/docker/wait.sh"
 	fi
 
-	# cleanup
-	docker stop netmaker-ui coredns mq turn caddy netmaker
-
 	chmod +x /root/wait.sh
 	mkdir -p /etc/netmaker
 
@@ -768,6 +765,9 @@ set -e
 # 6. get user input for variables
 set_install_vars
 
+# stop
+docker stop netmaker-ui coredns mq turn caddy netmaker
+
 # Fetch / update certs using certbot
 "$SCRIPT_DIR"/nm-certs.sh