From e8303a54a183b0ca0df08da1032c27a3fc7a8ca1 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Tue, 4 Apr 2023 11:10:14 -0400
Subject: [PATCH] BTCPay updates.

---
 btcpayserver/backup_btcpay.sh     |  8 ++++----
 btcpayserver/bashrc.txt           |  9 +++------
 btcpayserver/go.sh                | 11 -----------
 btcpayserver/stub_btcpay_setup.sh |  2 +-
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/btcpayserver/backup_btcpay.sh b/btcpayserver/backup_btcpay.sh
index 7eb3e34..9291950 100755
--- a/btcpayserver/backup_btcpay.sh
+++ b/btcpayserver/backup_btcpay.sh
@@ -11,7 +11,7 @@ echo "INFO: Starting BTCPAY Backup script for host '$BTCPAY_FQDN'."
 
 sleep 5
 
-ssh "$BTCPAY_FQDN" "mkdir -p $REMOTE_HOME/backups; cd $REMOTE_DATA_PATH/; sudo BTCPAY_BASE_DIRECTORY=$REMOTE_DATA_PATH bash -c $BTCPAY_SERVER_APPPATH/btcpay-down.sh"
+ssh "$BTCPAY_FQDN" "mkdir -p $REMOTE_BACKUP_PATH; cd $REMOTE_DATA_PATH/; sudo BTCPAY_BASE_DIRECTORY=$REMOTE_DATA_PATH bash -c $BTCPAY_SERVER_APPPATH/btcpay-down.sh"
 
 # TODO; not sure if this is necessary, but we want to give the VM additional time to take down all services
 # that way processes can run shutdown procedures and leave files in the correct state.
@@ -24,8 +24,8 @@ ssh "$BTCPAY_FQDN" "sudo cp $REMOTE_DATA_PATH/btcpay-backup.sh $BTCPAY_SERVER_AP
 ssh "$BTCPAY_FQDN" "cd $REMOTE_DATA_PATH/; sudo BTCPAY_BASE_DIRECTORY=$REMOTE_DATA_PATH BTCPAY_DOCKER_COMPOSE=$REMOTE_DATA_PATH/btcpayserver-docker/Generated/docker-compose.generated.yml bash -c $BTCPAY_SERVER_APPPATH/btcpay-backup.sh"
 
 # next we pull the resulting backup archive down to our management machine.
-ssh "$BTCPAY_FQDN" "sudo cp /var/lib/docker/volumes/backup_datadir/_data/backup.tar.gz $REMOTE_HOME/backups/btcpay.tar.gz"
-ssh "$BTCPAY_FQDN" "sudo chown ubuntu:ubuntu $REMOTE_HOME/backups/btcpay.tar.gz"
+ssh "$BTCPAY_FQDN" "sudo cp /var/lib/docker/volumes/backup_datadir/_data/backup.tar.gz $REMOTE_BACKUP_PATH/btcpay.tar.gz"
+ssh "$BTCPAY_FQDN" "sudo chown ubuntu:ubuntu $REMOTE_BACKUP_PATH/btcpay.tar.gz"
 
 # if the backup archive path is not set, then we set it. It is usually set only when we are running a migration script.
 BTCPAY_LOCAL_BACKUP_PATH="$SITES_PATH/$PRIMARY_DOMAIN/backups/btcpayserver"
@@ -34,6 +34,6 @@ if [ -z "$BACKUP_BTCPAY_ARCHIVE_PATH" ]; then
 fi
 
 mkdir -p "$BTCPAY_LOCAL_BACKUP_PATH"
-scp "$BTCPAY_FQDN:$REMOTE_HOME/backups/btcpay.tar.gz" "$BACKUP_BTCPAY_ARCHIVE_PATH"
+scp "$BTCPAY_FQDN:$REMOTE_BACKUP_PATH/btcpay.tar.gz" "$BACKUP_BTCPAY_ARCHIVE_PATH"
 
 echo "INFO: Created backup archive '$BACKUP_BTCPAY_ARCHIVE_PATH' for host '$BTCPAY_FQDN'."
diff --git a/btcpayserver/bashrc.txt b/btcpayserver/bashrc.txt
index afbb134..677a43a 100644
--- a/btcpayserver/bashrc.txt
+++ b/btcpayserver/bashrc.txt
@@ -1,6 +1,3 @@
-# we append this text to the btcpay server /home/ubuntu/.bashrc so
-# logged in users have more common access to the variou
-
-alias bitcoin-cli="bitcoin-cli.sh $@"
-alias lightning-cli="bitcoin-lightning-cli.sh $@"
-
+# these aliases are simply calling the btcpay server scripts.
+alias bitcoin-cli="/home/ubuntu/ss-data/btcpayserver-docker/bitcoin-cli.sh $@"
+alias lightning-cli="/home/ubuntu/ss-data/btcpayserver-docker/bitcoin-lightning-cli.sh $@"
diff --git a/btcpayserver/go.sh b/btcpayserver/go.sh
index 7491201..91a3cb9 100755
--- a/btcpayserver/go.sh
+++ b/btcpayserver/go.sh
@@ -25,15 +25,6 @@ elif [ "$RESTORE_BTCPAY" = true ]; then
     
     ./restore.sh
 
-    RUN_SERVICES=true
-    BACKUP_BTCPAY=false
-
-elif [ "$RECONFIGURE_BTCPAY_SERVER" == true ]; then
-    # the administrator may have indicated a reconfig;
-    # if so, we re-run setup script.
-    ./stub_btcpay_setup.sh
-
-    RUN_SERVICES=true
     BACKUP_BTCPAY=false
 fi
 
@@ -48,5 +39,3 @@ if [ "$STOP_SERVICES" = false ]; then
     # we bring the services back up by default.
     ssh "$FQDN" "bash -c $BTCPAY_SERVER_APPPATH/btcpay-up.sh"
 fi
-
-echo "FINISHED btcpayserver/go.sh"
diff --git a/btcpayserver/stub_btcpay_setup.sh b/btcpayserver/stub_btcpay_setup.sh
index 539d60b..3df29f5 100755
--- a/btcpayserver/stub_btcpay_setup.sh
+++ b/btcpayserver/stub_btcpay_setup.sh
@@ -90,7 +90,7 @@ EOF
 . ./btcpay-setup.sh -i
 
 touch ${REMOTE_DATA_PATH}/btcpay.complete
-
+chown ubuntu:ubuntu ${REMOTE_DATA_PATH}/btcpay.complete
 EOL