Unindent due to project iteration removal.

deploy.sh

@@ -289,59 +289,61 @@ EOL
     echo "INFO: Learn more at https://www.sovereign-stack.org/ss-deploy/"
 
     exit 1
-    fi
+fi
 
-    # source project defition.
+. ../project_env.sh
-    source "$PROJECT_DEFINITION_PATH"
 
-    if [ -z "$PRIMARY_DOMAIN" ]; then
+if [ -z "$PRIMARY_DOMAIN" ]; then
     echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project.conf."
     exit 1
-    fi
+fi
 
-    if [ -z "$WWW_SERVER_MAC_ADDRESS" ]; then
+if [ -z "$WWW_SERVER_MAC_ADDRESS" ]; then
     echo "ERROR: the WWW_SERVER_MAC_ADDRESS is not specified. Check your project.conf."
     exit 1
-    fi
+fi
 
 
-    if [ -z "$BTCPAYSERVER_MAC_ADDRESS" ]; then
+if [ -z "$BTCPAYSERVER_MAC_ADDRESS" ]; then
     echo "ERROR: the BTCPAYSERVER_MAC_ADDRESS is not specified. Check your project.conf."
     exit 1
-    fi
+fi
 
-    # the DOMAIN_LIST is a complete list of all our domains. We often iterate over this list.
+# the DOMAIN_LIST is a complete list of all our domains. We often iterate over this list.
-    DOMAIN_LIST="${PRIMARY_DOMAIN}"
+DOMAIN_LIST="${PRIMARY_DOMAIN}"
-    if [ -n "$OTHER_SITES_LIST" ]; then
+if [ -n "$OTHER_SITES_LIST" ]; then
     DOMAIN_LIST="${DOMAIN_LIST},${OTHER_SITES_LIST}"
-    fi
+fi
 
-    export DOMAIN_LIST="$DOMAIN_LIST"
+export DOMAIN_LIST="$DOMAIN_LIST"
-    export DOMAIN_COUNT=$(("$(echo "$DOMAIN_LIST" | tr -cd , | wc -c)"+1))
+export DOMAIN_COUNT=$(("$(echo "$DOMAIN_LIST" | tr -cd , | wc -c)"+1))
 
-    # let's provision our primary domain first.
+# let's provision our primary domain first.
-    export DOMAIN_NAME="$PRIMARY_DOMAIN"
+export DOMAIN_NAME="$PRIMARY_DOMAIN"
 
-    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-    export PRIMARY_WWW_FQDN="$WWW_HOSTNAME.$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.
+stub_site_definition
-    # www
-    VPS_HOSTNAME=
 
-    if ! lxc image list --format csv | grep -q "$DOCKER_BASE_IMAGE_NAME"; then
+# 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
+fi
 
-    for VIRTUAL_MACHINE in www btcpayserver; do
+for VIRTUAL_MACHINE in www btcpayserver; do
     export VIRTUAL_MACHINE="$VIRTUAL_MACHINE"
     FQDN=
 
@@ -356,12 +358,6 @@ EOL
         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 features.storage.volumes=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
@@ -380,7 +376,6 @@ EOL
 
     # 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
 
@@ -424,9 +419,9 @@ EOL
 
     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"
+    export ROOT_DISK_SIZE_GB="$ROOT_DISK_SIZE_GB"
 
     ./deploy_vm.sh
 
@@ -440,30 +435,28 @@ EOL
         fi
     fi
     
-    done
+done
 
-    # let's stub out the rest of our site definitions, if any.
+# let's stub out the rest of our site definitions, if any.
-    for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do
+for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
 
     # stub out the site_defition if it's doesn't exist.
     stub_site_definition
-    done
+done
 
 
-    # now let's run the www and btcpay-specific provisioning scripts.
+# now let's run the www and btcpay-specific provisioning scripts.
-    if [ "$SKIP_WWW" = false ]; then
+if [ "$SKIP_WWW" = false ]; then
     ./www/go.sh
     ssh ubuntu@"$PRIMARY_WWW_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
-    fi
+fi
 
-    export DOMAIN_NAME="$PRIMARY_DOMAIN"
+export DOMAIN_NAME="$PRIMARY_DOMAIN"
-    export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
+export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
-    if [ "$SKIP_BTCPAY" = false ]; then
+if [ "$SKIP_BTCPAY" = false ]; then
     ./btcpayserver/go.sh
 
     ssh ubuntu@"$BTCPAY_FQDN" "echo $LATEST_GIT_COMMIT > /home/ubuntu/.ss-githead"
-    fi
+fi
-
-done