Remove deployment string, add order deets.

deployment/remote.sh

@@ -33,7 +33,7 @@ if [ ! -f "$REMOTE_DEFINITION" ]; then
 # https://www.sovereign-stack.org/ss-remote
 
 LXD_REMOTE_PASSWORD="$(gpg --gen-random --armor 1 14)"
-DEPLOYMENT_STRING="(dev|regtest),(staging|testnet)"
+# DEPLOYMENT_STRING="(dev|regtest),(staging|testnet)"
 # REGISTRY_URL=http://registry.domain.tld:5000
 
 EOL

deployment/remote_env.sh

@@ -38,6 +38,7 @@ if [ ! -f "$REMOTE_DEFINITION" ]; then
     exit 1
 fi
 
+DEPLOYMENT_STRING=
 source "$REMOTE_DEFINITION"
 
 # let's provision the projects if specified in the remote.conf file.

deployment/up.sh

@@ -48,10 +48,9 @@ RESTORE_BTCPAY=false
 UPDATE_BTCPAY=false
 REMOTE_NAME="$(lxc remote get-default)"
 USER_SAYS_YES=false
-
-WWW_SERVER_MAC_ADDRESS=
-BTCPAY_SERVER_MAC_ADDRESS=
-LNPLAY_SERVER_MAC_ADDRESS=
+LNPLAY_ENV_FILE_PATH=
+VM_EXPIRATION_DATE=
+ORDER_ID=
 
 # grab any modifications from the command line.
 for i in "$@"; do
@@ -96,6 +95,18 @@ for i in "$@"; do
             SKIP_BASE_IMAGE_CREATION=true
             shift
         ;;
+        --lnplay-env-path=*)
+            LNPLAY_ENV_FILE_PATH="${i#*=}"
+            shift
+        ;;
+        --vm-expiration-date=*)
+            VM_EXPIRATION_DATE="${i#*=}"
+            shift
+        ;;
+        --order-id=*)
+            ORDER_ID="${i#*=}"
+            shift
+        ;;
         --no-cert-renew)
             RUN_CERT_RENEWAL=false
             shift
@@ -173,6 +184,7 @@ export REMOTE_PATH="$REMOTES_PATH/$REMOTE_NAME"
 export USER_SAYS_YES="$USER_SAYS_YES"
 export BACKUP_BTCPAY_ARCHIVE_PATH="$BACKUP_BTCPAY_ARCHIVE_PATH"
 export RESTORE_CERTS="$RESTORE_CERTS"
+export LNPLAY_ENV_FILE_PATH="$LNPLAY_ENV_FILE_PATH"
 
 # todo convert this to Trezor-T
 SSH_PUBKEY_PATH="$SSH_HOME/id_rsa.pub"
@@ -413,11 +425,12 @@ for VIRTUAL_MACHINE in www btcpayserver lnplayserver; do
     fi
 
     export FQDN="$FQDN"
-    export LXD_VM_NAME="${FQDN//./-}"
+    LXD_VM_NAME="${FQDN//./-}"
+    export LXD_VM_NAME="$LXD_VM_NAME"
     export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION"
     export PROJECT_PATH="$PROJECT_PATH"
 
-    ./deploy_vm.sh
+    env ORDER_ID="$ORDER_ID" VM_EXPIRATION_DATE="$VM_EXPIRATION_DATE" LXD_VM_NAME="$LXD_VM_NAME" ./deploy_vm.sh
 
 done