From a17a4530de92d5449c60dd763c85648dfdcfd0d2 Mon Sep 17 00:00:00 2001 From: Tobias Cudnik Date: Wed, 10 May 2023 18:29:48 +0200 Subject: [PATCH] fixed caddy start/stop --- scripts/nm-certs.sh | 2 +- scripts/nm-quick.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/nm-certs.sh b/scripts/nm-certs.sh index 07cdbbf4..931e6678 100755 --- a/scripts/nm-certs.sh +++ b/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 diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh index 82353816..ffb91525 100755 --- a/scripts/nm-quick.sh +++ b/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