From 7ce1f0adbef23be3ac80f440d4b962690fe181a3 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Mon, 6 Mar 2023 11:47:27 -0500
Subject: [PATCH] Stability improvements.

---
 defaults.sh                                  |  6 +++---
 deployment/btcpayserver/go.sh                |  5 +----
 deployment/btcpayserver/stub_btcpay_setup.sh |  3 +--
 deployment/cluster.sh                        |  2 +-
 deployment/deploy.sh                         |  4 ++--
 deployment/destroy.sh                        |  1 -
 deployment/stub_lxc_profile.sh               | 20 ++++++++++++++------
 deployment/www/go.sh                         |  7 ++++---
 deployment/www/prepare_clams.sh              | 15 +--------------
 9 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/defaults.sh b/defaults.sh
index 087489c..ea68118 100755
--- a/defaults.sh
+++ b/defaults.sh
@@ -53,7 +53,7 @@ DEFAULT_DB_IMAGE="mariadb:10.9.3-jammy"
 
 
 # run the docker stack.
-export GHOST_IMAGE="ghost:5.26.2"
+export GHOST_IMAGE="ghost:5.37.0"
 
 # TODO switch to mysql. May require intricate export work for existing sites. 
 # THIS MUST BE COMPLETED BEFORE v1 RELEASE
@@ -61,10 +61,10 @@ export GHOST_IMAGE="ghost:5.26.2"
 export GHOST_DB_IMAGE="$DEFAULT_DB_IMAGE"
 
 
-export NGINX_IMAGE="nginx:1.23.2"
+export NGINX_IMAGE="nginx:1.23.3"
 
 # version of backup is 24.0.3
-export NEXTCLOUD_IMAGE="nextcloud:25.0.2"
+export NEXTCLOUD_IMAGE="nextcloud:25.0.4"
 export NEXTCLOUD_DB_IMAGE="$DEFAULT_DB_IMAGE"
 
 # TODO PIN the gitea version number.
diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index e027189..c8c3631 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
 
-set -eu
+set -exu
 cd "$(dirname "$0")"
 
 export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN"
 
-docker pull btcpayserver/lightning:v22.11.1
-docker build -t clightning:latest ./core-lightning
-
 # run the btcpay setup script if it hasn't been done before.
 if [ "$(ssh "$BTCPAY_FQDN" [[ ! -f "$REMOTE_HOME/btcpay.complete" ]]; echo $?)" -eq 0 ]; then
     ./stub_btcpay_setup.sh
diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh
index acf1105..06b08ac 100755
--- a/deployment/btcpayserver/stub_btcpay_setup.sh
+++ b/deployment/btcpayserver/stub_btcpay_setup.sh
@@ -20,8 +20,7 @@ export CLIGHTNING_WEBSOCKET_PORT="$CLIGHTNING_WEBSOCKET_PORT"
 # It also supports modern TLS, so SSL certs must be available.
 #opt-add-nostr-relay;
 
-export BTCPAYSERVER_GITREPO="https://github.com/farscapian/btcpayserver-docker"
-#https://github.com/btcpayserver/btcpayserver-docker
+export BTCPAYSERVER_GITREPO="https://github.com/btcpayserver/btcpayserver-docker"
 
 cat > "$SITE_PATH/btcpay.sh" <<EOL
 #!/bin/bash
diff --git a/deployment/cluster.sh b/deployment/cluster.sh
index c53d490..5ad460f 100755
--- a/deployment/cluster.sh
+++ b/deployment/cluster.sh
@@ -36,7 +36,7 @@ if [ ! -f "$CLUSTER_DEFINITION" ]; then
 export LXD_CLUSTER_PASSWORD="$(gpg --gen-random --armor 1 14)"
 export BITCOIN_CHAIN="regtest"
 export PROJECT_PREFIX="dev"
-#export REGISTRY_URL="https://index.docker.io/v1/"
+#export REGISTRY_URL=http://registry.domain.tld:5000
 
 EOL
 
diff --git a/deployment/deploy.sh b/deployment/deploy.sh
index 4b1d870..29eb3dd 100755
--- a/deployment/deploy.sh
+++ b/deployment/deploy.sh
@@ -13,8 +13,8 @@ DOMAIN_NAME=
 RUN_CERT_RENEWAL=true
 SKIP_WWW=false
 RESTORE_WWW=false
-BACKUP_CERTS=false
-BACKUP_APPS=false
+BACKUP_CERTS=true
+BACKUP_APPS=true
 BACKUP_BTCPAY=true
 BACKUP_BTCPAY_ARCHIVE_PATH=
 RESTORE_BTCPAY=false
diff --git a/deployment/destroy.sh b/deployment/destroy.sh
index e5a7977..306bcac 100755
--- a/deployment/destroy.sh
+++ b/deployment/destroy.sh
@@ -19,7 +19,6 @@ fi
 
 . ../defaults.sh
 
-
 . ./cluster_env.sh
 
 . ./project_env.sh
diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh
index 66460f2..d55c080 100755
--- a/deployment/stub_lxc_profile.sh
+++ b/deployment/stub_lxc_profile.sh
@@ -94,6 +94,12 @@ if [ "$LXD_HOSTNAME" = "$BASE_IMAGE_VM_NAME" ]; then
               UsePAM no
               LogLevel INFO
 
+      - path: /etc/docker/daemon.json
+        content: |
+              {
+                "registry-mirrors": ["${REGISTRY_URL}"]
+              }
+
     runcmd:
       - sudo mkdir -m 0755 -p /etc/apt/keyrings
       - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -104,6 +110,13 @@ if [ "$LXD_HOSTNAME" = "$BASE_IMAGE_VM_NAME" ]; then
 
 EOF
 
+    #   - path: /etc/docker/daemon.json
+    #     content: |
+    #           {
+    #             "registry-mirrors": "${REGISTRY_URL}",
+    #             "labels": "githead=${LATEST_GIT_COMMIT}"
+    #           }
+                #"labels": [githead="${LATEST_GIT_COMMIT}"]
 
     # apt:
     #   sources:
@@ -111,12 +124,7 @@ EOF
     #       source: "deb [arch=amd64] https://download.docker.com/linux/ubuntu ${LXD_UBUNTU_BASE_VERSION} stable"
     #       keyid: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
 
-    #   - path: /etc/docker/daemon.json
-    #     content: |
-    #           {
-    #             "registry-mirrors": ["${REGISTRY_URL}"],
-    #             "labels": [ "githead=${LATEST_GIT_COMMIT}" ]
-    #           }
+
 
 
 #      - sudo apt-get update
diff --git a/deployment/www/go.sh b/deployment/www/go.sh
index 78f0729..ac01811 100755
--- a/deployment/www/go.sh
+++ b/deployment/www/go.sh
@@ -3,15 +3,16 @@
 set -eu
 cd "$(dirname "$0")"
 
+# redirect all docker commands to the remote host.
+DOCKER_HOST="ssh://ubuntu@$PRIMARY_WWW_FQDN"
+export DOCKER_HOST="$DOCKER_HOST"
+
 # prepare clams images and such
 ./prepare_clams.sh
 
 # Create the nginx config file which covers all domains.
 bash -c ./stub/nginx_config.sh
 
-# redirect all docker commands to the remote host.
-export DOCKER_HOST="ssh://ubuntu@$PRIMARY_WWW_FQDN"
-
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
diff --git a/deployment/www/prepare_clams.sh b/deployment/www/prepare_clams.sh
index fefe217..33a3276 100755
--- a/deployment/www/prepare_clams.sh
+++ b/deployment/www/prepare_clams.sh
@@ -5,7 +5,6 @@ cd "$(dirname "$0")"
 
 # deploy clams wallet.
 LOCAL_CLAMS_REPO_PATH="$(pwd)/clams"
-
 if [ ! -d "$LOCAL_CLAMS_REPO_PATH" ]; then
     git clone "$CLAMS_GIT_REPO" "$LOCAL_CLAMS_REPO_PATH"
 else
@@ -15,28 +14,16 @@ else
     cd -
 fi
 
-
-# # overwrite the clams/.env file with Sovereign Stack specific parameters.
-# CLAMS_CONFIG_PATH="$LOCAL_CLAMS_REPO_PATH/.env"
-# cat > "$CLAMS_CONFIG_PATH" <<EOF
-# CLAMS_FQDN=${CLAMS_FQDN}
-# BTC_CHAIN=${BITCOIN_CHAIN}
-# DEPLOY_BTC_BACKEND=false
-# EOF
-
 # lxc file push -r -p "$LOCAL_CLAMS_REPO_PATH" "${PRIMARY_WWW_FQDN//./-}$REMOTE_HOME"
-
-
 BROWSER_APP_GIT_TAG="1.5.0"
 BROWSER_APP_GIT_REPO_URL="https://github.com/clams-tech/browser-app"
 BROWSER_APP_IMAGE_NAME="browser-app:$BROWSER_APP_GIT_TAG"
-
 # build the browser-app image.
 if ! docker image list --format "{{.Repository}}:{{.Tag}}" | grep -q "$BROWSER_APP_IMAGE_NAME"; then
     docker build --build-arg GIT_REPO_URL="$BROWSER_APP_GIT_REPO_URL" \
     --build-arg VERSION="$BROWSER_APP_GIT_TAG" \
     -t "$BROWSER_APP_IMAGE_NAME" \
-    ./clams/frontend/browser-app/
+    $(pwd)/clams/frontend/browser-app/
 fi
 
 # If the clams-root volume doesn't exist, we create and seed it.