Switch lnplay to tabconf branch.

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
+# TODO switch to btcpay-backup.sh when on LXD fully.
 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

@@ -26,13 +26,19 @@ if [ "$UPDATE_BTCPAY" = true ]; then
 elif [ "$RESTORE_BTCPAY" = true ]; then
     # run the update.
     ssh "$BTCPAY_SERVER_FQDN" "bash -c $BTCPAY_SERVER_APPPATH/btcpay-down.sh"
-    sleep 15
+    sleep 25
     
     ./restore.sh
 
     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"

domain_env.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 
 export NEXTCLOUD_FQDN="$NEXTCLOUD_HOSTNAME.$DOMAIN_NAME"
 export BTCPAY_USER_FQDN="$BTCPAY_HOSTNAME_IN_CERT.$DOMAIN_NAME"
@@ -19,6 +19,7 @@ SHASUM_OF_DOMAIN="$(echo -n "$DOMAIN_NAME" | sha256sum | awk '{print $1;}' )"
 export DOMAIN_IDENTIFIER="${SHASUM_OF_DOMAIN: -6}"
 echo "$DOMAIN_IDENTIFIER" > "$SITE_PATH/domain_id"
 
+SITE_LANGUAGE_CODES=en
 export LANGUAGE_CODE_COUNT=$(("$(echo "$SITE_LANGUAGE_CODES" | tr -cd , | wc -c)"+1))
 
 STACK_NAME="$DOMAIN_IDENTIFIER-en"

lnplay

@@ -1 +1 @@
-Subproject commit e9a18f9385414c1dc34381f39c2709cf115c907f
+Subproject commit 0a3562e4f2d477cdae17e8f675b4319aa0b07cf1

project_defaults.sh

@@ -27,12 +27,8 @@ export NEXTCLOUD_MYSQL_ROOT_PASSWORD=
 export GITEA_MYSQL_ROOT_PASSWORD=
 export DUPLICITY_BACKUP_PASSPHRASE=
 
-
-
 DEFAULT_DB_IMAGE="mariadb:10.11.2-jammy"
 
-
-
 # run the docker stack.
 export GHOST_IMAGE="ghost:5.53.3"
 
@@ -54,6 +50,5 @@ export GITEA_DB_IMAGE="$DEFAULT_DB_IMAGE"
 
 export NOSTR_RELAY_IMAGE="scsibug/nostr-rs-relay"
 
-
 export OTHER_SITES_LIST=
 export BTCPAY_ALT_NAMES=

www/backup_www.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 APP=

www/generate_certs.sh

@@ -3,7 +3,7 @@
 set -e
 
 # let's do a refresh of the certificates. Let's Encrypt will not run if it's not time.
-docker pull certbot/certbot:latest
+docker pull -q certbot/certbot:latest
 
 # iterate over each domain and call certbot
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
@@ -15,7 +15,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     source "$SITE_PATH/site.conf"
     source ../domain_env.sh
 
-    # with the incus side, we are trying to expose ALL OUR services from one IP address, which terminates
+    # with the lxd 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/go.sh

@@ -84,7 +84,17 @@ fi
 
 # generate the certs and grab a backup
 if [ "$RUN_CERT_RENEWAL" = true ] && [ "$RESTORE_CERTS" = false ] && [ "$STACKS_STILL_RUNNING" = false ]; then
-    ./generate_certs.sh
+    echo "SKIPPING CERT GENERATION"
+    #./generate_certs.sh
+fi
+
+
+if [ "$RESTORE_WWW" = true ]; then
+    APP_LIST="letsencrypt ghost gitea nostr"
+    for APP in $APP_LIST; do
+        export APP="$APP"
+        ./restore_path.sh
+    done
 fi
 
 # nginx gets deployed first since it "owns" the docker networks of downstream services.

www/restore_path.sh

@@ -3,6 +3,13 @@
 set -eu
 cd "$(dirname "$0")"
 
+# these variable are used by both backup/restore scripts.
+export REMOTE_BACKUP_PATH="$REMOTE_BACKUP_PATH/www/$APP/$DOMAIN_IDENTIFIER"
+export REMOTE_SOURCE_BACKUP_PATH="$REMOTE_DATA_PATH/$APP/$DOMAIN_NAME"
+
+export LOCAL_BACKUP_PATH="$SITE_PATH/backups/www/$APP"
+mkdir -p "$LOCAL_BACKUP_PATH"
+
 FILE_COUNT="$(find "$LOCAL_BACKUP_PATH" -type f | wc -l)"
 if [ "$FILE_COUNT" = 0 ]; then
     exit 0

www/stop_docker_stacks.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 # this scripts brings down the docker stacks on www
@@ -23,7 +23,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
             STACK_NAME="$DOMAIN_IDENTIFIER-$APP-$LANGUAGE_CODE"
 
             if docker stack list --format "{{.Name}}" | grep -q "$STACK_NAME"; then
-                docker stack rm "$STACK_NAME"
+                docker stack rm "$STACK_NAME" > /dev/null
                 sleep 2
             fi
 
@@ -45,7 +45,7 @@ done
 
 # remove the nginx stack
 if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
-    docker stack rm reverse-proxy
+    docker stack rm reverse-proxy > /dev/null
 
     sleep 10
 fi

www/stub/ghost_yml.sh

@@ -4,7 +4,7 @@ set -eu
 cd "$(dirname "$0")"
 
 
-docker pull "$GHOST_IMAGE"
+docker pull -q "$GHOST_IMAGE"
 
 DEPLOY_STACK=false
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do

www/stub/gitea_yml.sh

@@ -4,8 +4,8 @@ set -eu
 cd "$(dirname "$0")"
 
 
-docker pull "$GITEA_IMAGE"
+docker pull -q "$GITEA_IMAGE"
-docker pull "$GITEA_DB_IMAGE"
+docker pull -q "$GITEA_DB_IMAGE"
 
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"

www/stub/nextcloud_yml.sh

@@ -4,7 +4,7 @@ set -eu
 cd "$(dirname "$0")"
 
 
-docker pull "$NEXTCLOUD_IMAGE"
+docker pull -q "$NEXTCLOUD_IMAGE"
 
 
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do

www/stub/nginx_config.sh

@@ -251,6 +251,7 @@ 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;

www/stub/nginx_yml.sh

@@ -3,7 +3,7 @@
 set -e
 cd "$(dirname "$0")"
 
-docker pull "$NGINX_IMAGE"
+docker pull -q "$NGINX_IMAGE"
 
 #https://github.com/fiatjaf/expensive-relay
 # NOSTR RELAY WHICH REQUIRES PAYMENTS.

www/stub/nostr_yml.sh

@@ -3,7 +3,7 @@
 set -eu
 cd "$(dirname "$0")"
 
-docker pull "$NOSTR_RELAY_IMAGE"
+docker pull -q "$NOSTR_RELAY_IMAGE"
 
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"