From c042ff404f02d3fc1739b325660411c68e3bf0b3 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Mon, 13 Mar 2023 13:38:14 -0400
Subject: [PATCH] Debug updates and change to remote.conf

---
 create_lxc_base.sh  |   2 +-
 deploy.sh           | 388 ++++++++++++++++++++++----------------------
 stub_lxc_profile.sh |   2 +-
 3 files changed, 200 insertions(+), 192 deletions(-)

diff --git a/create_lxc_base.sh b/create_lxc_base.sh
index 9a11d37..552c777 100755
--- a/create_lxc_base.sh
+++ b/create_lxc_base.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 bash -c "./stub_lxc_profile.sh --lxd-hostname=$BASE_IMAGE_VM_NAME"
diff --git a/deploy.sh b/deploy.sh
index 6d0fd93..2fe9df9 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -156,16 +156,16 @@ fi
 # ensure our remote path is created.
 mkdir -p "$REMOTE_PATH"
 
-REMOTE_DEFINITION="$REMOTE_PATH/remote_definition"
-export REMOTE_DEFINITION="$REMOTE_DEFINITION"
-
-#########################################
+REMOTE_DEFINITION="$REMOTE_PATH/remote.conf"
 if [ ! -f "$REMOTE_DEFINITION" ]; then
     echo "ERROR: The remote definition could not be found. You may need to re-run 'ss-remote'."
     exit 1
 fi
 
+export REMOTE_DEFINITION="$REMOTE_DEFINITION"
 source "$REMOTE_DEFINITION"
+export LXD_REMOTE_PASSWORD="$LXD_REMOTE_PASSWORD"
+export DEPLOYMENT_STRING="$DEPLOYMENT_STRING"
 
 # this is our password generation mechanism. Relying on GPG for secure password generation
 function new_pass {
@@ -217,216 +217,224 @@ EOL
 
 }
 
-PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN"
-PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME"
-mkdir -p "$PROJECT_PATH" "$REMOTE_PATH/projects"
-export PROJECT_NAME="$PROJECT_NAME"
-export PROJECT_PATH="$PROJECT_PATH"
+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"
 
-# create a symlink from ./remotepath/projects/project
-if [ ! -d "$REMOTE_PATH/projects/$PROJECT_NAME" ]; then
-    ln -s "$PROJECT_PATH" "$REMOTE_PATH/projects/$PROJECT_NAME"
-fi
+    PROJECT_NAME="$PROJECT_PREFIX-$BITCOIN_CHAIN"
+    PROJECT_PATH="$PROJECTS_DIR/$PROJECT_NAME"
 
-# check to see if the enf file exists. exist if not.
-PROJECT_DEFINITION_PATH="$PROJECT_PATH/project_definition"
-if [ ! -f "$PROJECT_DEFINITION_PATH" ]; then
+    mkdir -p "$PROJECT_PATH" "$REMOTE_PATH/projects"
 
-    # stub out a project_definition
-    cat >"$PROJECT_DEFINITION_PATH" <<EOL
-#!/bin/bash
+    # create a symlink from ./remotepath/projects/project
+    if [ ! -d "$REMOTE_PATH/projects/$PROJECT_NAME" ]; then
+        ln -s "$PROJECT_PATH" "$REMOTE_PATH/projects/$PROJECT_NAME"
+    fi
 
-# see https://www.sovereign-stack.org/project-definition for more info.
+    # check to see if the enf file exists. exist if not.
+    PROJECT_DEFINITION_PATH="$PROJECT_PATH/project.conf"
+    if [ ! -f "$PROJECT_DEFINITION_PATH" ]; then
 
-export WWW_SERVER_MAC_ADDRESS=
-export BTCPAYSERVER_MAC_ADDRESS=
-export PRIMARY_DOMAIN=
-#export OTHER_SITES_LIST="domain1.tld,domain2.tld,domain3.tld"
-export BTCPAY_SERVER_CPU_COUNT="4"
-export BTCPAY_SERVER_MEMORY_MB="4096"
-export WWW_SERVER_CPU_COUNT="6"
-export WWW_SERVER_MEMORY_MB="4096"
+        # stub out a project.conf
+        cat >"$PROJECT_DEFINITION_PATH" <<EOL
+# see https://www.sovereign-stack.org/ss-deploy for more info.
+
+PRIMARY_DOMAIN=
+# OTHER_SITES_LIST="domain1.tld,domain2.tld,domain3.tld"
+
+WWW_SERVER_MAC_ADDRESS=
+# WWW_SERVER_CPU_COUNT="6"
+# WWW_SERVER_MEMORY_MB="4096"
+
+BTCPAYSERVER_MAC_ADDRESS=
+# BTCPAY_SERVER_CPU_COUNT="4"
+# BTCPAY_SERVER_MEMORY_MB="4096"
 
 EOL
 
-    chmod 0744 "$PROJECT_DEFINITION_PATH"
-    echo "INFO: we stubbed a new project_defition for you at '$PROJECT_DEFINITION_PATH'. Go update it!"
-    echo "INFO: Learn more at https://www.sovereign-stack.org/ss-deploy/"
+        chmod 0744 "$PROJECT_DEFINITION_PATH"
+        echo "INFO: we stubbed a new 'project.conf' for you at '$PROJECT_DEFINITION_PATH'. Go update it!"
+        echo "INFO: Learn more at https://www.sovereign-stack.org/ss-deploy/"
 
-    exit 1
-fi
-
-# source project defition.
-source "$PROJECT_DEFINITION_PATH"
-
-if [ -z "$PRIMARY_DOMAIN" ]; then
-    echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project_definition."
-    exit 1
-fi
-
-if [ -z "$WWW_SERVER_MAC_ADDRESS" ]; then
-    echo "ERROR: the WWW_SERVER_MAC_ADDRESS is not specified. Check your project_definition."
-    exit 1
-fi
-
-
-if [ -z "$BTCPAYSERVER_MAC_ADDRESS" ]; then
-    echo "ERROR: the BTCPAYSERVER_MAC_ADDRESS is not specified. Check your project_definition."
-    exit 1
-fi
-
-# the DOMAIN_LIST is a complete list of all our domains. We often iterate over this list.
-DOMAIN_LIST="${PRIMARY_DOMAIN}"
-if [ -n "$OTHER_SITES_LIST" ]; then
-    DOMAIN_LIST="${DOMAIN_LIST},${OTHER_SITES_LIST}"
-fi
-
-export DOMAIN_LIST="$DOMAIN_LIST"
-export DOMAIN_COUNT=$(("$(echo "$DOMAIN_LIST" | tr -cd , | wc -c)"+1))
-
-# let's provision our primary domain first.
-export DOMAIN_NAME="$PRIMARY_DOMAIN"
-
-export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME"
-
-stub_site_definition
-
-# bring the VMs up under the primary domain name.
-
-export UPDATE_BTCPAY="$UPDATE_BTCPAY"
-export RECONFIGURE_BTCPAY_SERVER="$RECONFIGURE_BTCPAY_SERVER"
-
-# iterate over all our server endpoints and provision them if needed.
-# www
-VPS_HOSTNAME=
-
-
-# Goal is to get the macvlan interface.
-LXD_SS_CONFIG_LINE=
-if lxc network list --format csv | grep lxdbr0 | grep -q ss-config; then
-    LXD_SS_CONFIG_LINE="$(lxc network list --format csv | grep lxdbr0 | grep ss-config)"
-fi
-
-if [ -z "$LXD_SS_CONFIG_LINE" ]; then
-    echo "ERROR: the MACVLAN interface has not been specified. You may need to run ss-remote again."
-    exit 1
-fi
-
-CONFIG_ITEMS="$(echo "$LXD_SS_CONFIG_LINE" | awk -F'"' '{print $2}')"
-DATA_PLANE_MACVLAN_INTERFACE="$(echo "$CONFIG_ITEMS" | cut -d ',' -f2)"
-export DATA_PLANE_MACVLAN_INTERFACE="$DATA_PLANE_MACVLAN_INTERFACE"
-
-if ! lxc image list --format csv | grep -q "$DOCKER_BASE_IMAGE_NAME"; then
-    # create the lxd base image.
-    ./create_lxc_base.sh
-fi
-
-for VIRTUAL_MACHINE in www btcpayserver; do
-    export VIRTUAL_MACHINE="$VIRTUAL_MACHINE"
-    FQDN=
-
-    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-
-    source "$SITE_PATH/site_definition"
-    source ./domain_env.sh
-
-    # VALIDATE THE INPUT from the ENVFILE
-    if [ -z "$DOMAIN_NAME" ]; then
-        echo "ERROR: DOMAIN_NAME not specified in your site_definition."
         exit 1
     fi
 
-    # create the lxc project as specified by PROJECT_NAME
-    if ! lxc project list | grep -q "$PROJECT_NAME"; then
-        lxc project create "$PROJECT_NAME"
-        lxc project set "$PROJECT_NAME" features.networks=true features.images=false
+    # source project defition.
+    source "$PROJECT_DEFINITION_PATH"
+
+    if [ -z "$PRIMARY_DOMAIN" ]; then
+        echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your 'project.conf'."
+        exit 1
     fi
 
-    # Now let's switch to the new project to ensure new resources are created under the project scope.
-    if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
-        echo "INFO: switch to lxd project '$PROJECT_NAME'."
-        lxc project switch "$PROJECT_NAME"
+    if [ -z "$WWW_SERVER_MAC_ADDRESS" ]; then
+        echo "ERROR: the WWW_SERVER_MAC_ADDRESS is not specified. Check your 'project.conf'."
+        exit 1
     fi
 
-    # check if the OVN network exists in this project.
-    if ! lxc network list | grep -q "ss-ovn"; then
-        lxc network create ss-ovn --type=ovn network=lxdbr1 ipv6.address=none
-        # ipv4.nat=false
+
+    if [ -z "$BTCPAYSERVER_MAC_ADDRESS" ]; then
+        echo "ERROR: the BTCPAYSERVER_MAC_ADDRESS is not specified. Check your 'project.conf'."
+        exit 1
     fi
 
-    export MAC_ADDRESS_TO_PROVISION=
-    export VPS_HOSTNAME="$VPS_HOSTNAME"
-    export FQDN="$VPS_HOSTNAME.$DOMAIN_NAME"
+    # the DOMAIN_LIST is a complete list of all our domains. We often iterate over this list.
+    DOMAIN_LIST="${PRIMARY_DOMAIN}"
+    if [ -n "$OTHER_SITES_LIST" ]; then
+        DOMAIN_LIST="${DOMAIN_LIST},${OTHER_SITES_LIST}"
+    fi
 
-    if [ "$VIRTUAL_MACHINE" = www ]; then
-        if [ "$SKIP_WWW" = true ]; then
-            echo "INFO: Skipping WWW due to command line argument."
-            continue
+    export DOMAIN_LIST="$DOMAIN_LIST"
+    export DOMAIN_COUNT=$(("$(echo "$DOMAIN_LIST" | tr -cd , | wc -c)"+1))
+
+    # let's provision our primary domain first.
+    export DOMAIN_NAME="$PRIMARY_DOMAIN"
+
+    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+    export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME"
+
+    stub_site_definition
+
+    # bring the VMs up under the primary domain name.
+
+    export UPDATE_BTCPAY="$UPDATE_BTCPAY"
+    export RECONFIGURE_BTCPAY_SERVER="$RECONFIGURE_BTCPAY_SERVER"
+
+    # iterate over all our server endpoints and provision them if needed.
+    # www
+    VPS_HOSTNAME=
+
+    if ! lxc image list --format csv | grep -q "$DOCKER_BASE_IMAGE_NAME"; then
+        # create the lxd base image.
+        ./create_lxc_base.sh
+    fi
+
+    for VIRTUAL_MACHINE in www btcpayserver; do
+        export VIRTUAL_MACHINE="$VIRTUAL_MACHINE"
+        FQDN=
+
+        export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+
+        source "$SITE_PATH/site_definition"
+        source ./domain_env.sh
+
+        # VALIDATE THE INPUT from the ENVFILE
+        if [ -z "$DOMAIN_NAME" ]; then
+            echo "ERROR: DOMAIN_NAME not specified in your site_definition."
+            exit 1
+        fi
+
+        # create the lxc project as specified by PROJECT_NAME
+        if ! lxc project list | grep -q "$PROJECT_NAME"; then
+            lxc project create "$PROJECT_NAME"
+            lxc project set "$PROJECT_NAME" features.networks=true features.images=false
+        fi
+
+        # Goal is to get the macvlan interface.
+        LXD_SS_CONFIG_LINE=
+        if lxc network list --format csv --project=default | grep lxdbr0 | grep -q "ss-config"; then
+            LXD_SS_CONFIG_LINE="$(lxc network list --format csv --project=default | grep lxdbr0 | grep ss-config)"
+        fi
+
+        if [ -z "$LXD_SS_CONFIG_LINE" ]; then
+            echo "ERROR: the MACVLAN interface has not been specified. You may need to run 'ss-remote' again."
+            exit 1
+        fi
+
+        CONFIG_ITEMS="$(echo "$LXD_SS_CONFIG_LINE" | awk -F'"' '{print $2}')"
+        DATA_PLANE_MACVLAN_INTERFACE="$(echo "$CONFIG_ITEMS" | cut -d ',' -f2)"
+        export DATA_PLANE_MACVLAN_INTERFACE="$DATA_PLANE_MACVLAN_INTERFACE"
+
+
+        # Now let's switch to the new project to ensure new resources are created under the project scope.
+        if ! lxc info | grep "project:" | grep -q "$PROJECT_NAME"; then
+            echo "INFO: switch to lxd project '$PROJECT_NAME'."
+            lxc project switch "$PROJECT_NAME"
+        fi
+
+        # check if the OVN network exists in this project.
+        if ! lxc network list | grep -q "ss-ovn"; then
+            lxc network create ss-ovn --type=ovn network=lxdbr1 ipv6.address=none
+            # ipv4.nat=false
+        fi
+
+        export MAC_ADDRESS_TO_PROVISION=
+        export VPS_HOSTNAME="$VPS_HOSTNAME"
+        export FQDN="$VPS_HOSTNAME.$DOMAIN_NAME"
+
+        if [ "$VIRTUAL_MACHINE" = www ]; then
+            if [ "$SKIP_WWW" = true ]; then
+                echo "INFO: Skipping WWW due to command line argument."
+                continue
+            fi
+            
+            FQDN="$WWW_HOSTNAME.$DOMAIN_NAME"
+            VPS_HOSTNAME="$WWW_HOSTNAME"
+            MAC_ADDRESS_TO_PROVISION="$WWW_SERVER_MAC_ADDRESS"
+            ROOT_DISK_SIZE_GB="$((ROOT_DISK_SIZE_GB + NEXTCLOUD_SPACE_GB))"
+
+        elif [ "$VIRTUAL_MACHINE" = btcpayserver ] || [ "$SKIP_BTCPAY" = true ]; then
+            FQDN="$BTCPAY_HOSTNAME.$DOMAIN_NAME"
+            VPS_HOSTNAME="$BTCPAY_HOSTNAME"
+            MAC_ADDRESS_TO_PROVISION="$BTCPAYSERVER_MAC_ADDRESS"
+            if [ "$BITCOIN_CHAIN" = mainnet ]; then
+                ROOT_DISK_SIZE_GB=150
+            elif [ "$BITCOIN_CHAIN" = testnet ]; then
+                ROOT_DISK_SIZE_GB=70
+            fi
+
+        elif [ "$VIRTUAL_MACHINE" = "$BASE_IMAGE_VM_NAME" ]; then
+            export FQDN="$BASE_IMAGE_VM_NAME"
+            ROOT_DISK_SIZE_GB=8
+        else
+            echo "ERROR: VIRTUAL_MACHINE not within allowable bounds."
+            exit
+        fi
+
+        export FQDN="$FQDN"
+        export LXD_VM_NAME="${FQDN//./-}"
+        export REMOTE_CERT_DIR="$REMOTE_CERT_BASE_DIR/$FQDN"
+        export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION"
+        export PROJECT_PATH="$PROJECT_PATH"
+
+        ./deploy_vm.sh
+
+        if [ "$VIRTUAL_MACHINE" = www ]; then
+            # this tells our local docker client to target the remote endpoint via SSH
+            export DOCKER_HOST="ssh://ubuntu@$PRIMARY_WWW_FQDN"
+
+            # enable docker swarm mode so we can support docker stacks.
+            if docker info | grep -q "Swarm: inactive"; then
+                docker swarm init --advertise-addr enp6s0
+            fi
         fi
         
-        FQDN="$WWW_HOSTNAME.$DOMAIN_NAME"
-        VPS_HOSTNAME="$WWW_HOSTNAME"
-        MAC_ADDRESS_TO_PROVISION="$WWW_SERVER_MAC_ADDRESS"
-        ROOT_DISK_SIZE_GB="$((ROOT_DISK_SIZE_GB + NEXTCLOUD_SPACE_GB))"
+    done
 
-    elif [ "$VIRTUAL_MACHINE" = btcpayserver ] || [ "$SKIP_BTCPAY" = true ]; then
-        FQDN="$BTCPAY_HOSTNAME.$DOMAIN_NAME"
-        VPS_HOSTNAME="$BTCPAY_HOSTNAME"
-        MAC_ADDRESS_TO_PROVISION="$BTCPAYSERVER_MAC_ADDRESS"
-        if [ "$BITCOIN_CHAIN" = mainnet ]; then
-            ROOT_DISK_SIZE_GB=150
-        elif [ "$BITCOIN_CHAIN" = testnet ]; then
-            ROOT_DISK_SIZE_GB=70
-        fi
+    # let's stub out the rest of our site definitions, if any.
+    for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do
+        export DOMAIN_NAME="$DOMAIN_NAME"
+        export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
 
-    elif [ "$VIRTUAL_MACHINE" = "$BASE_IMAGE_VM_NAME" ]; then
-        export FQDN="$BASE_IMAGE_VM_NAME"
-        ROOT_DISK_SIZE_GB=8
-    else
-        echo "ERROR: VIRTUAL_MACHINE not within allowable bounds."
-        exit
+        # stub out the site_defition if it's doesn't exist.
+        stub_site_definition
+    done
+
+
+    # now let's run the www and btcpay-specific provisioning scripts.
+    if [ "$SKIP_WWW" = false ]; then
+        ./www/go.sh
+        ssh ubuntu@"$PRIMARY_WWW_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
     fi
 
-    export FQDN="$FQDN"
-    export LXD_VM_NAME="${FQDN//./-}"
-    export REMOTE_CERT_DIR="$REMOTE_CERT_BASE_DIR/$FQDN"
-    export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION"
-
-    ./deploy_vm.sh
-
-    if [ "$VIRTUAL_MACHINE" = www ]; then
-        # this tells our local docker client to target the remote endpoint via SSH
-        export DOCKER_HOST="ssh://ubuntu@$PRIMARY_WWW_FQDN"
-
-        # enable docker swarm mode so we can support docker stacks.
-        if docker info | grep -q "Swarm: inactive"; then
-            docker swarm init --advertise-addr enp6s0
-        fi
-    fi
-    
-done
-
-# let's stub out the rest of our site definitions, if any.
-for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do
-    export DOMAIN_NAME="$DOMAIN_NAME"
+    export DOMAIN_NAME="$PRIMARY_DOMAIN"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+    if [ "$SKIP_BTCPAY" = false ]; then
+        ./btcpayserver/go.sh
 
-    # stub out the site_defition if it's doesn't exist.
-    stub_site_definition
-done
-
-
-# now let's run the www and btcpay-specific provisioning scripts.
-if [ "$SKIP_WWW" = false ]; then
-    ./www/go.sh
-    ssh ubuntu@"$PRIMARY_WWW_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
-fi
-
-export DOMAIN_NAME="$PRIMARY_DOMAIN"
-export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-if [ "$SKIP_BTCPAY" = false ]; then
-    ./btcpayserver/go.sh
-
-    ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
-fi
+        ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
+    fi
+done
\ No newline at end of file
diff --git a/stub_lxc_profile.sh b/stub_lxc_profile.sh
index 5da7528..9d8a19a 100755
--- a/stub_lxc_profile.sh
+++ b/stub_lxc_profile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 VIRTUAL_MACHINE=base