From 070df55bf37c67998e6e71d1425ce4ec55bfa7e6 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Sun, 13 Nov 2022 20:27:27 -0500
Subject: [PATCH] Clean up migration and NOSTR updates.

---
 deployment/btcpayserver/go.sh       | 5 -----
 deployment/www/generate_certs.sh    | 4 ++--
 deployment/www/go.sh                | 2 +-
 deployment/www/stub/nginx_config.sh | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index 74aed8d..296822c 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -29,11 +29,6 @@ elif [ "$RESTORE_BTCPAY" = true ]; then
     RUN_SERVICES=true
     OPEN_URL=true
 
-    # if this is a new VM from a migration procedure, then we can now run setup.
-    if [ "$MIGRATE_BTCPAY" = true ]; then
-        ./stub_btcpay_setup.sh
-    fi
-
 elif [ "$RECONFIGURE_BTCPAY_SERVER" == true ]; then
     # the administrator may have indicated a reconfig;
     # if so, we re-run setup script.
diff --git a/deployment/www/generate_certs.sh b/deployment/www/generate_certs.sh
index a7057bd..9d68b27 100755
--- a/deployment/www/generate_certs.sh
+++ b/deployment/www/generate_certs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 
 # let's do a refresh of the certificates. Let's Encrypt will not run if it's not time.
@@ -25,7 +25,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     DOMAIN_STRING="-d $DOMAIN_NAME -d $WWW_FQDN -d $BTCPAY_USER_FQDN"
     if [ "$DEPLOY_NEXTCLOUD" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NEXTCLOUD_FQDN"; fi
     if [ "$DEPLOY_GITEA" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $GITEA_FQDN"; fi
-    if [ "$DEPLOY_NOSTR" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NOSTR_FQDN"; fi
+    if [ "$DEPLOY_NOSTR_RELAY" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NOSTR_FQDN"; fi
     
     # if BTCPAY_ALT_NAMES has been set by the admin, iterate over the list
     # and append the domain names to the certbot request
diff --git a/deployment/www/go.sh b/deployment/www/go.sh
index 5e0fdac..19863e3 100755
--- a/deployment/www/go.sh
+++ b/deployment/www/go.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -exu
 cd "$(dirname "$0")"
 
 # Create the nginx config file which covers all domains.
diff --git a/deployment/www/stub/nginx_config.sh b/deployment/www/stub/nginx_config.sh
index a8bffdc..e0ba65a 100755
--- a/deployment/www/stub/nginx_config.sh
+++ b/deployment/www/stub/nginx_config.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -exu
 cd "$(dirname "$0")"