Move backup_path.sh up a level, refactors.

www/go.sh

@@ -3,11 +3,6 @@
 set -exu
 cd "$(dirname "$0")"
 
-# redirect all docker commands to the remote host.
-DOCKER_HOST="ssh://ubuntu@$WWW_FQDN"
-export DOCKER_HOST="$DOCKER_HOST"
-
-
 # Create the nginx config file which covers all domainys.
 bash -c ./stub/nginx_config.sh
 
@@ -77,26 +72,20 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
 
 done
 
-./stop_docker_stacks.sh
-
 # TODO check if there are any other stacks that are left running (other than reverse proxy)
 # if so, this may mean the user has disabled one or more domains and that existing sites/services
 # are still running. We should prompt the user of this and quit. They have to go manually docker stack remove these.
+STACKS_STILL_RUNNING=false
 if [[ $(docker stack list | wc -l) -gt 2 ]]; then
-    echo "WARNING! You still have stacks running. If you have modified the SITES list, you may need to go remove the docker stacks runnong the remote machine."
-    echo "exiting."
-    exit 1
+    echo "WARNING! You still have stacks running. If you have modified the SITES list,"
+    echo "         you may need to go remove the docker stacks running the remote machine."
+    STACKS_STILL_RUNNING=true
 fi
 
-# ok, the backend stacks are stopped.
-if [ "$RESTART_FRONT_END" = true ]; then
-
 # generate the certs and grab a backup
-    if [ "$RUN_CERT_RENEWAL" = true ] && [ "$RESTORE_CERTS" = false ]; then
-        if [ "$STOP_SERVICES" = false ]; then
+if [ "$RUN_CERT_RENEWAL" = true ] && [ "$RESTORE_CERTS" = false ] && [ "$STACKS_STILL_RUNNING" = false ]; then
     ./generate_certs.sh
 fi
-    fi
 
 # let's backup all our letsencrypt certs
 export APP="letsencrypt"
@@ -122,8 +111,10 @@ if [ "$RESTART_FRONT_END" = true ]; then
     if [ "$RESTORE_CERTS" = true ]; then
         ./restore_path.sh
     else
+        if [ "$BACKUP_WWW_APPS" = true ]; then 
             ./backup_path.sh
         fi
+    fi
 done
 
 # nginx gets deployed first since it "owns" the docker networks of downstream services.
@@ -134,24 +125,3 @@ done
 ./stub/nextcloud_yml.sh
 ./stub/gitea_yml.sh
 ./stub/nostr_yml.sh
-
-
-
-# # start a browser session; point it to port 80 to ensure HTTPS redirect.
-# # WWW_FQDN is in our certificate, so we resolve to that.
-# wait-for-it -t 320 "$WWW_FQDN:80"
-# wait-for-it -t 320 "$WWW_FQDN:443"
-
-# # open bowser tabs.
-# if [ "$DEPLOY_GHOST" = true ]; then
-#     xdg-open "http://$WWW_FQDN" > /dev/null 2>&1
-# fi
-
-# if [ "$DEPLOY_NEXTCLOUD" = true ]; then
-#     xdg-open "http://$NEXTCLOUD_FQDN" > /dev/null 2>&1
-# fi
-
-# if [ "$DEPLOY_GITEA" = true ]; then
-#     xdg-open "http://$GITEA_FQDN" > /dev/null 2>&1
-# fi
-

www/stop_docker_stacks.sh

@@ -37,15 +37,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
             if [ ! -d "$LOCAL_BACKUP_PATH" ]; then
                 mkdir -p "$LOCAL_BACKUP_PATH"
             fi
-
-            if [ "$RESTORE_WWW" = true ]; then
-                ./restore_path.sh
-            fi
-            
-            if [ "$BACKUP_APPS" = true ]; then
-                # if we're not restoring, then we may or may not back up.
-                ./backup_path.sh
-            fi
         done
     done
 done