Enable debuggin on www

btcpayserver/backup_btcpay.sh

@@ -18,7 +18,7 @@ ssh "$BTCPAY_SERVER_FQDN" "mkdir -p $REMOTE_BACKUP_PATH; cd $REMOTE_DATA_PATH/;
 sleep 10
 
 # TODO enable encrypted archives
-# TODO switch to btcpay-backup.sh when on LXD fully.
+# TODO switch to btcpay-backup.sh
 scp ./remote_scripts/btcpay-backup.sh "$BTCPAY_SERVER_FQDN:$REMOTE_DATA_PATH/btcpay-backup.sh"
 ssh "$BTCPAY_SERVER_FQDN" "sudo cp $REMOTE_DATA_PATH/btcpay-backup.sh $BTCPAY_SERVER_APPPATH/btcpay-backup.sh && sudo chmod 0755 $BTCPAY_SERVER_APPPATH/btcpay-backup.sh"
 ssh "$BTCPAY_SERVER_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"

btcpayserver/go.sh

@@ -33,12 +33,6 @@ elif [ "$RESTORE_BTCPAY" = true ]; then
     BACKUP_BTCPAY=false
 fi
 
-# if the script gets this far, then we grab a regular backup.
-if [ "$BACKUP_BTCPAY" = true ]; then
-    # we just grab a regular backup
-    ./backup_btcpay.sh
-fi
-
 # The default is to resume services, though admin may want to keep services off (eg., for a migration)
 # we bring the services back up by default.
 ssh "$BTCPAY_SERVER_FQDN" "bash -c $BTCPAY_SERVER_APPPATH/btcpay-up.sh"

lnplay

@@ -1 +1 @@
-Subproject commit ea683f696fe16436ca425a4c925a780f8f218a34
+Subproject commit e9a18f9385414c1dc34381f39c2709cf115c907f

project_defaults.sh

@@ -54,8 +54,6 @@ export GITEA_DB_IMAGE="$DEFAULT_DB_IMAGE"
 
 export NOSTR_RELAY_IMAGE="scsibug/nostr-rs-relay"
 
-export WWW_SERVER_MAC_ADDRESS=
-export BTCPAY_SERVER_MAC_ADDRESS=
 
 export OTHER_SITES_LIST=
 export BTCPAY_ALT_NAMES=

www/generate_certs.sh

@@ -15,7 +15,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     source "$SITE_PATH/site.conf"
     source ../domain_env.sh
 
-    # with the lxd side, we are trying to expose ALL OUR services from one IP address, which terminates
+    # with the incus side, we are trying to expose ALL OUR services from one IP address, which terminates
     # at a cachehing reverse proxy that runs nginx.
 
     ssh "$PRIMARY_WWW_FQDN" sudo mkdir -p "$REMOTE_DATA_PATH_LETSENCRYPT/$DOMAIN_NAME/_logs"

www/stop_docker_stacks.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -exu
 cd "$(dirname "$0")"
 
 # this scripts brings down the docker stacks on www

www/stub/nginx_config.sh

@@ -251,7 +251,6 @@ EOL
 
         # Route everything to the real BTCPay server
         location / {
-            #proxy_pass http://${BTCPAY_SERVER_FQDN//./-}.lxd:80;
             proxy_pass http://10.10.10.66:80;
             proxy_set_header Host \$http_host;
             proxy_set_header X-Forwarded-Proto \$scheme;