fixed caddy start/stop

This commit is contained in:
Tobias Cudnik 2023-05-10 18:29:48 +02:00
parent f855ca4016
commit a17a4530de
2 changed files with 4 additions and 4 deletions

View file

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

View file

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