Remove iteration over PROJECTS.

deployment/destroy.sh

@@ -31,24 +31,6 @@ done
 
 . ./remote_env.sh
 
-for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
-    NO_PARENS="${PROJECT_CHAIN:1:${#PROJECT_CHAIN}-2}"
-    PROJECT_PREFIX=$(echo "$NO_PARENS" | cut -d'|' -f1)
-    BITCOIN_CHAIN=$(echo "$NO_PARENS" | cut -d'|' -f2)
-
-    PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN"
-    PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME"
-
-    # if the user sets USER_TARGET_PROJECT, let's ensure the project exists.
-    if [ -n "$USER_TARGET_PROJECT" ]; then
-        if [ "$PROJECT_NAME" != "$USER_TARGET_PROJECT" ]; then
-            continue
-        fi
-    fi
-
-    export PROJECT_NAME="$PROJECT_NAME"
-    export PROJECT_PATH="$PROJECT_PATH"
-
 . ./project_env.sh
 
     if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
@@ -94,18 +76,9 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
     lxc network delete ss-ovn
 fi
 
-    if ! lxc info | grep "project:" | grep -q default; then
-        lxc project switch default
-    fi
-
-    if lxc project list | grep -q "$PROJECT_NAME"; then
-        lxc project delete "$PROJECT_NAME"
-    fi
-
 # delete the base image so it can be created.
 if lxc list | grep -q "$BASE_IMAGE_VM_NAME"; then
-        lxc delete -f "$BASE_IMAGE_VM_NAME"
+    lxc delete -f "$BASE_IMAGE_VM_NAME" --project default
     # remove the ssh known endpoint else we get warnings.
-        ssh-keygen -f "$SSH_HOME/known_hosts" -R "$LXD_NAME"
+    ssh-keygen -f "$SSH_HOME/known_hosts" -R "$BASE_IMAGE_VM_NAME"
 fi
-done

deployment/show.sh

@@ -7,7 +7,6 @@ cd "$(dirname "$0")"
 
 . ./remote_env.sh
 
-
 echo "Global Settings:"
 
 lxc image list
@@ -17,21 +16,15 @@ lxc storage volume list ss-base
 echo
 echo
 
-for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
+export PROJECT_NAME="$(lxc info | grep "project:" | awk '{print $2}')"
-    NO_PARENS="${PROJECT_CHAIN:1:${#PROJECT_CHAIN}-2}"
+export PROJECT_PATH="$PROJECTS_PATH/$PROJECT_NAME"
-    PROJECT_PREFIX=$(echo "$NO_PARENS" | cut -d'|' -f1)
+
-    BITCOIN_CHAIN=$(echo "$NO_PARENS" | cut -d'|' -f2)
+
-    PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN"
 
 echo
 echo
 echo "Project: $PROJECT_NAME"
 echo "----------------------------------------------------------"
-    if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
-        if lxc project list | grep -q "$PROJECT_NAME"; then
-            lxc project switch "$PROJECT_NAME"
-        fi
-    fi
 
 echo "  Networks:"
 lxc network list
@@ -42,4 +35,3 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
 echo "  Instances (VMs):"
 lxc list
 echo "----------------------------------------------------------"
-done

deployment/update.sh

@@ -22,54 +22,10 @@ if [ "$RESPONSE" != "y" ]; then
     exit 0
 fi
 
-
-USER_TARGET_PROJECT=
-
-# grab any modifications from the command line.
-for i in "$@"; do
-    case $i in
-        --project=*)
-            USER_TARGET_PROJECT="${i#*=}"
-            shift
-        ;;
-
-        *)
-        echo "Unexpected option: $1"
-        exit 1
-        ;;
-    esac
-done
-
-
 . ../defaults.sh
 
 . ./remote_env.sh
 
-for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
-    NO_PARENS="${PROJECT_CHAIN:1:${#PROJECT_CHAIN}-2}"
-    PROJECT_PREFIX=$(echo "$NO_PARENS" | cut -d'|' -f1)
-    BITCOIN_CHAIN=$(echo "$NO_PARENS" | cut -d'|' -f2)
-    export PROJECT_PREFIX="$PROJECT_PREFIX"
-    export BITCOIN_CHAIN="$BITCOIN_CHAIN"
-
-    PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN"
-    PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME"
-
-    # if the user sets USER_TARGET_PROJECT, let's ensure the project exists.
-    if [ -n "$USER_TARGET_PROJECT" ]; then
-        if ! lxc project list | grep -q "$USER_TARGET_PROJECT"; then
-            echo "ERROR: the project does not exist! Nothing to update."
-            exit 1
-        fi
-
-        if [ "$PROJECT_NAME" != "$USER_TARGET_PROJECT" ]; then
-            continue
-        fi
-    fi
-
-    export PROJECT_NAME="$PROJECT_NAME"
-    export PROJECT_PATH="$PROJECT_PATH"
-
 . ./project_env.sh
 
 # Check to see if any of the VMs actually don't exist. 
@@ -112,10 +68,10 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
 cd -
 
 # run deploy which backups up everything, but doesnt restart any services.
-    bash -c "./project/deploy.sh --project=$PROJECT_NAME --stop --no-cert-renew --backup-archive-path=$BTCPAY_RESTORE_ARCHIVE_PATH"
+bash -c "./project/deploy.sh --stop --no-cert-renew --backup-archive-path=$BTCPAY_RESTORE_ARCHIVE_PATH"
 
-    # call the destroy script. If user proceed, then user data is DESTROYED!
+# call the destroy script. This brings down the existing deployment. Does NOT destroy docker data.
-    bash -c "./destroy.sh --project=$PROJECT_NAME"
+bash -c "./destroy.sh"
      
 cd project/
 echo "INFO: switching the 'project' repo back to the most recent commit '$TARGET_PROJECT_GIT_COMMIT'"
@@ -124,6 +80,4 @@ for PROJECT_CHAIN in ${DEPLOYMENT_STRING//,/ }; do
 cd -
 
 # Then we can run a restore operation and specify the backup archive at the CLI.
-    bash -c "./project/deploy.sh --project=$PROJECT_NAME -y --restore-www --restore-btcpay --backup-archive-path=$BTCPAY_RESTORE_ARCHIVE_PATH"
+bash -c "./project/deploy.sh -y --restore-www --restore-btcpay --backup-archive-path=$BTCPAY_RESTORE_ARCHIVE_PATH"
-
-done