Control flow updates.

deploy.sh

@@ -23,6 +23,7 @@ RECONFIGURE_BTCPAY_SERVER=false
 CLUSTER_NAME="$(lxc remote get-default)"
 STOP_SERVICES=false
 USER_SAYS_YES=false
+RESTART_FRONT_END=false
 
 # grab any modifications from the command line.
 for i in "$@"; do

deployment/www/restore_path.sh

@@ -34,4 +34,5 @@ scp -r "$LOCAL_BACKUP_PATH" "$PRIMARY_WWW_FQDN:$REMOTE_BACKUP_PATH"
 # now we run duplicity to restore the archive.
 ssh "$PRIMARY_WWW_FQDN" sudo PASSPHRASE="$DUPLICITY_BACKUP_PASSPHRASE" duplicity --force restore "file://$REMOTE_BACKUP_PATH/$APP" "$REMOTE_SOURCE_BACKUP_PATH/"
 
-ssh "$PRIMARY_WWW_FQDN" sudo chown ubuntu:ubuntu "$REMOTE_BACKUP_PATH"
+# reset folder owner to ubuntu
+ssh "$PRIMARY_WWW_FQDN" sudo chown ubuntu:ubuntu "$REMOTE_HOME/$APP"

deployment/www/stop_docker_stacks.sh

@@ -48,55 +48,51 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     done
 done
 
-# remove the nginx stack
+if [ "$RESTART_FRONT_END" = true ]; then
-if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
+    # remove the nginx stack
-    sleep 2
+    if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
+        sleep 2
 
-    docker stack rm reverse-proxy
+        docker stack rm reverse-proxy
 
-    # wait for all docker containers to stop.
+        # wait for all docker containers to stop.
-    # TODO see if there's a way to check for this.
+        # TODO see if there's a way to check for this.
-    sleep 15
+        sleep 15
-    
+        
-fi
-
-# 
-if [ "$STOP_SERVICES" = true ]; then
-    echo "STOPPING as indicated by the --stop flag."
-    exit 0
-fi
-
-# generate the certs and grab a backup
-if [ "$RUN_CERT_RENEWAL" = true ]; then
-    ./generate_certs.sh
-fi
-
-# let's backup all our letsencrypt certs
-export APP="letsencrypt"
-for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
-    export DOMAIN_NAME="$DOMAIN_NAME"
-    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-
-    # source the site path so we know what features it has.
-    source "$RESPOSITORY_PATH/reset_env.sh"
-    source "$SITE_PATH/site_definition"
-    source "$RESPOSITORY_PATH/domain_env.sh"
-
-    # these variable are used by both backup/restore scripts.
-    export REMOTE_BACKUP_PATH="$REMOTE_HOME/backups/www/$APP/$DOMAIN_IDENTIFIER"
-    export REMOTE_SOURCE_BACKUP_PATH="$REMOTE_HOME/$APP/$DOMAIN_NAME"
-
-    # ensure our local backup path exists so we can pull down the duplicity archive to the management machine.
-    export LOCAL_BACKUP_PATH="$SITE_PATH/backups/www/$APP"
-    mkdir -p "$LOCAL_BACKUP_PATH"
-
-    if [ "$RESTORE_WWW" = true ]; then
-        sleep 5
-        echo "STARTING restore_path.sh for letsencrypt."
-        ./restore_path.sh
-        #ssh "$PRIMARY_WWW_FQDN" sudo chown ubuntu:ubuntu "$REMOTE_HOME/$APP"
-    elif [ "$BACKUP_APPS"  = true ]; then
-        # if we're not restoring, then we may or may not back up.
-        ./backup_path.sh
     fi
-done
+
+    # generate the certs and grab a backup
+    if [ "$RUN_CERT_RENEWAL" = true ]; then
+        ./generate_certs.sh
+    fi
+
+    # let's backup all our letsencrypt certs
+    export APP="letsencrypt"
+    for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
+        export DOMAIN_NAME="$DOMAIN_NAME"
+        export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+
+        # source the site path so we know what features it has.
+        source "$RESPOSITORY_PATH/reset_env.sh"
+        source "$SITE_PATH/site_definition"
+        source "$RESPOSITORY_PATH/domain_env.sh"
+
+        # these variable are used by both backup/restore scripts.
+        export REMOTE_BACKUP_PATH="$REMOTE_HOME/backups/www/$APP/$DOMAIN_IDENTIFIER"
+        export REMOTE_SOURCE_BACKUP_PATH="$REMOTE_HOME/$APP/$DOMAIN_NAME"
+
+        # ensure our local backup path exists so we can pull down the duplicity archive to the management machine.
+        export LOCAL_BACKUP_PATH="$SITE_PATH/backups/www/$APP"
+        mkdir -p "$LOCAL_BACKUP_PATH"
+
+        if [ "$RESTORE_WWW" = true ]; then
+            sleep 5
+            echo "STARTING restore_path.sh for letsencrypt."
+            ./restore_path.sh
+            #ssh "$PRIMARY_WWW_FQDN" sudo chown ubuntu:ubuntu "$REMOTE_HOME/$APP"
+        elif [ "$BACKUP_APPS"  = true ]; then
+            # if we're not restoring, then we may or may not back up.
+            ./backup_path.sh
+        fi
+    done
+fi

migrate.sh

@@ -6,8 +6,17 @@ cd "$(dirname "$0")"
 CURRENT_CLUSTER="$(lxc remote get-default)"
 
 if echo "$CURRENT_CLUSTER" | grep -q "production"; then
-    echo "ERROR: YOU MUST COMMENT THIS OUT BEFORE YOU CAN RUN MIGRATE ON PROUDCTION/."
+    echo "WARNING: You are running a migration procedure on a production system."
-    exit 1
+    echo ""
+
+
+    RESPONSE=
+    read -r -p "         Are you sure you want to continue (y)  ": RESPONSE
+    if [ "$RESPONSE" != "y" ]; then
+        echo "STOPPING."
+        exit 1
+    fi
+
 fi
 
 source ./defaults.sh