From 286fd7176cf8ab594e5f6a96e85334e4a754e65f Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Sun, 23 Oct 2022 21:04:50 -0400
Subject: [PATCH] Minor whitespace improvements after assess btcpay.

---
 defaults.sh                                  | 7 +++++++
 deploy.sh                                    | 9 ++-------
 deployment/btcpayserver/bashrc               | 2 ++
 deployment/btcpayserver/go.sh                | 6 +++---
 deployment/btcpayserver/stub_btcpay_setup.sh | 3 ++-
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 deployment/btcpayserver/bashrc

diff --git a/defaults.sh b/defaults.sh
index e4468c3..8020786 100755
--- a/defaults.sh
+++ b/defaults.sh
@@ -18,6 +18,8 @@ export BTCPAY_HOSTNAME_IN_CERT="tip"
 export NEXTCLOUD_HOSTNAME="nextcloud"
 export GITEA_HOSTNAME="git"
 export NOSTR_HOSTNAME="relay"
+
+
 export NOSTR_ACCOUNT_PUBKEY=
 
 # used by 'aws' deployments only; planned deprecation
@@ -109,7 +111,12 @@ DEFAULT_DB_IMAGE="mariadb:10.9.3-jammy"
 
 # run the docker stack.
 export GHOST_IMAGE="ghost:5.18.0"
+
+# TODO switch to mysql. May require intricate export work. THIS MUST BE COMPLETED BEFORE v1 RELEASE
+#https://forum.ghost.org/t/how-to-migrate-from-mariadb-10-to-mysql-8/29575
 export GHOST_DB_IMAGE="$DEFAULT_DB_IMAGE"
+
+
 export NGINX_IMAGE="nginx:1.23.1"
 
 # version of backup is 24.0.3
diff --git a/deploy.sh b/deploy.sh
index 21226ff..91e88ef 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -28,7 +28,7 @@ RESTORE_ARCHIVE=
 VPS_HOSTING_TARGET=lxd
 RUN_CERT_RENEWAL=false
 RESTORE_WWW=false
-BACKUP_CERTS=false
+BACKUP_CERTS=true
 BACKUP_APPS=true
 BACKUP_BTCPAY=false
 RESTORE_BTCPAY=false
@@ -38,7 +38,7 @@ USER_SKIP_WWW=false
 USER_SKIP_BTCPAY=false
 UPDATE_BTCPAY=false
 RECONFIGURE_BTCPAY_SERVER=false
-DEPLOY_BTCPAY_SERVER=false
+DEPLOY_BTCPAY_SERVER=true
 CLUSTER_NAME="$(lxc remote get-default)"
 STOP_SERVICES=false
 
@@ -325,13 +325,8 @@ function instantiate_vms {
         export LXD_VM_NAME="${FQDN//./-}"
         export VIRTUAL_MACHINE="$VIRTUAL_MACHINE"
         export REMOTE_CERT_DIR="$REMOTE_CERT_BASE_DIR/$FQDN"
-        
         export MAC_ADDRESS_TO_PROVISION="$MAC_ADDRESS_TO_PROVISION"
 
-
-        
-
-
         # This next section of if statements is our sanity checking area.
         if [ "$VPS_HOSTING_TARGET" = aws ]; then
             # we require DDNS on AWS to set the public DNS to the right host.
diff --git a/deployment/btcpayserver/bashrc b/deployment/btcpayserver/bashrc
new file mode 100644
index 0000000..15d0e39
--- /dev/null
+++ b/deployment/btcpayserver/bashrc
@@ -0,0 +1,2 @@
+# we append this text to the btcpay server /home/ubuntu/.bashrc so
+# logged in users have more common access to the variou
\ No newline at end of file
diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index 338c309..1f03664 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -5,8 +5,8 @@ cd "$(dirname "$0")"
 
 export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN"
 
-OPEN_URL=false
-RUN_SERVICES=false
+OPEN_URL=true
+RUN_SERVICES=true
 
 # we will re-run the btcpayserver provisioning scripts if directed to do so.
 # if an update does occur, we grab another backup.
@@ -18,7 +18,7 @@ if [ "$UPDATE_BTCPAY" = true ]; then
     ssh "$FQDN" "sudo bash -c $BTCPAY_SERVER_APPPATH/btcpay-update.sh"
 
     sleep 20
-    
+
 elif [ "$RESTORE_BTCPAY" = true ]; then
     # run the update.
     ssh "$FQDN" "bash -c $BTCPAY_SERVER_APPPATH/btcpay-down.sh"
diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh
index 32f6b36..003c3eb 100755
--- a/deployment/btcpayserver/stub_btcpay_setup.sh
+++ b/deployment/btcpayserver/stub_btcpay_setup.sh
@@ -37,10 +37,11 @@ export NBITCOIN_NETWORK="${BTC_CHAIN}"
 export LIGHTNING_ALIAS="${DOMAIN_NAME}"
 export BTCPAYGEN_LIGHTNING="clightning"
 export BTCPAYGEN_CRYPTO1="btc"
-export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage;opt-add-btctransmuter;opt-add-nostr-relay;"
+export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage-s;opt-add-btctransmuter;opt-add-nostr-relay;"
 export BTCPAYGEN_REVERSEPROXY="nginx"
 export BTCPAY_ENABLE_SSH=false
 export BTCPAY_BASE_DIRECTORY=${REMOTE_HOME}
+
 EOL
 
 # can add opt-add-tor-relay; in BTCPAYGEN_ADDITIONAL_FRAGMENTS