From 9a4f90d27bb5f3b2094d69d36e3c06c1329620f5 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Wed, 3 Aug 2022 10:57:19 -0400
Subject: [PATCH] Make Migration flag more broad. Use --skip

---
 deploy.sh                     | 12 ++++++------
 deployment/btcpayserver/go.sh |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 43adf86..9a1759f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,7 +23,7 @@ if ! lsb_release -d | grep -q "Ubuntu 22.04 LTS"; then
     exit 1
 fi
 
-MIGRATE_BTCPAY=false
+MIGRATE_VPS=false
 DOMAIN_NAME=
 RESTORE_ARCHIVE=
 VPS_HOSTING_TARGET=lxd
@@ -80,8 +80,8 @@ for i in "$@"; do
             USER_NO_BACKUP=true
             shift
         ;;
-        --migrate-btcpay)
-            MIGRATE_BTCPAY=true
+        --migrate)
+            MIGRATE_VPS=true
             RUN_CERT_RENEWAL=false
             shift
         ;;
@@ -211,7 +211,7 @@ function run_domain {
     export RUN_CERT_RENEWAL="$RUN_CERT_RENEWAL"
     export BTC_CHAIN="$BTC_CHAIN"
     export UPDATE_BTCPAY="$UPDATE_BTCPAY"
-    export MIGRATE_BTCPAY="$MIGRATE_BTCPAY"
+    export MIGRATE_VPS="$MIGRATE_VPS"
     export RECONFIGURE_BTCPAY_SERVER="$RECONFIGURE_BTCPAY_SERVER"
 
     # iterate over all our server endpoints and provision them if needed.
@@ -387,7 +387,7 @@ function run_domain {
 
         if [ "$MACHINE_EXISTS"  = true ]; then
             # we delete the machine if the user has directed us to
-            if [ "$MIGRATE_BTCPAY" = true ]; then
+            if [ "$MIGRATE_VPS" = true ]; then
                 
                 # if the RESTORE_ARCHIVE is not set, then 
                 if [ -z "$RESTORE_ARCHIVE" ]; then
@@ -423,7 +423,7 @@ function run_domain {
                 RESTORE_BTCPAY="$RESTORE_BTCPAY" UPDATE_BTCPAY="$UPDATE_BTCPAY" RUN_RESTORE="$USER_RUN_RESTORE" RUN_BACKUP="$RUN_BACKUP" RUN_SERVICES=true ./deployment/domain_init.sh
             fi
         else
-            if [ "$MIGRATE_BTCPAY" = true ]; then
+            if [ "$MIGRATE_VPS" = true ]; then
                 echo "INFO: User has indicated to delete the machine, but it doesn't exist. Going to create it anyway."
             fi
 
diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index 04c0782..8b50d84 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -25,7 +25,7 @@ elif [ "$RESTORE_BTCPAY" = true ]; then
     OPEN_URL=true
 
     # if this is a new VM from a migration procedure, then we can now run setup.
-    if [ "$MIGRATE_BTCPAY" = true ]; then
+    if [ "$MIGRATE_VPS" = true ]; then
         ./stub_btcpay_setup.sh
     fi