From d9509381ceb9ba55189bd94c7792583c47a9d1cd Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Fri, 14 Jan 2022 16:25:45 -0500
Subject: [PATCH] Various updates.

---
 command.sh              | 2 +-
 refresh.sh => deploy.sh | 2 +-
 entrypoint.sh           | 2 +-
 generate_certs.sh       | 4 ++--
 go_btcpay.sh            | 2 +-
 go_www.sh               | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename refresh.sh => deploy.sh (99%)

diff --git a/command.sh b/command.sh
index 8f32e64..77ba2be 100644
--- a/command.sh
+++ b/command.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bash -c ./refresh.sh --domain=bitizen.store --hosting-provider=lxd --macvlan-interface=eno3 --storage-backend=/dev/sda 
+bash -c ./deploy.sh --domain=bitizen.store --hosting-provider=lxd --macvlan-interface=eno3 --storage-backend=/dev/sda 
diff --git a/refresh.sh b/deploy.sh
similarity index 99%
rename from refresh.sh
rename to deploy.sh
index a4b6a15..42157c9 100755
--- a/refresh.sh
+++ b/deploy.sh
@@ -31,7 +31,7 @@ for i in "$@"; do
             USER_RUN_RESTORE=true
             shift
         ;;
-        --update)
+        --update-btcpay)
             UPDATE_BTCPAY=true
             shift
         ;;
diff --git a/entrypoint.sh b/entrypoint.sh
index fd746a3..522ced1 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,4 +5,4 @@ if [ -z "$DOMAIN_NAME" ]; then
     exit 1
 fi
 
-/sovereign-stack/refresh.sh --domain="$DOMAIN_NAME"
+/sovereign-stack/deploy.sh --domain="$DOMAIN_NAME"
diff --git a/generate_certs.sh b/generate_certs.sh
index 201e126..69b4aba 100755
--- a/generate_certs.sh
+++ b/generate_certs.sh
@@ -12,8 +12,8 @@ docker run -it --rm \
     -p 443:443 \
     -v /etc/letsencrypt:/etc/letsencrypt \
     -v /var/lib/letsencrypt:/var/lib/letsencrypt certbot/certbot \
-    certonly -v --noninteractive --agree-tos --key-type ecdsa --standalone --expand -d "$DOMAIN_NAME" -d "$FQDN" -d "$NEXTCLOUD_FQDN" -d "$MATRIX_FQDN" -d "$GITEA_FQDN" --email "$CERTIFICATE_EMAIL_ADDRESS"
-
+    certonly -v --noninteractive --agree-tos --key-type ecdsa --standalone --expand -d "$DOMAIN_NAME" -d "$FQDN" -d "$NEXTCLOUD_FQDN" -d "$MATRIX_FQDN" --email "$CERTIFICATE_EMAIL_ADDRESS"
+#-d "$GITEA_FQDN" 
 # backup the certs to our SITE_PATH/certs.tar.gz so we have them handy (for local development)
 ssh "$FQDN" sudo tar -zcvf "$REMOTE_HOME/certs.tar.gz" -C /etc ./letsencrypt
 ssh "$FQDN" sudo chown ubuntu:ubuntu "$REMOTE_HOME/certs.tar.gz"
diff --git a/go_btcpay.sh b/go_btcpay.sh
index f1a0a3b..11eea5b 100755
--- a/go_btcpay.sh
+++ b/go_btcpay.sh
@@ -32,7 +32,7 @@ if [ "$RUN_RESTORE" = true ]; then
     ./restore_btcpay.sh
 fi
 
-
+# the administrator may have indicated a reconfig; if so, re-run the setup (useful for adding alternative names to TLS)
 if [ "$RECONFIGURE_BTCPAY_SERVER"  = true ]; then
     # re-run the setup script.
     ./run_btcpay_setup.sh
diff --git a/go_www.sh b/go_www.sh
index 1355984..843cf16 100755
--- a/go_www.sh
+++ b/go_www.sh
@@ -25,7 +25,7 @@ fi
 # stop services.
 if docker stack list --format "{{.Name}}" | grep -q webstack; then
     docker stack rm webstack
-    sleep 10
+    sleep 20
 fi
 
 # this will generate letsencrypt certs and pull them down locally.
@@ -69,7 +69,7 @@ if [ "$DEPLOY_MATRIX" = true ]; then
             -e POSTGRES_PASSWORD="${MATRIX_DB_PASSWORD}" \
             -e SYNAPSE_NO_TLS=1 \
             -e SYNAPSE_ENABLE_REGISTRATION=yes \
-            -e SYNAPSE_LOG_LEVEL=DEBUG \
+            -e SYNAPSE_LOG_LEVEL=INFO \
             -e POSTGRES_DB=synapse \
             -e POSTGRES_HOST=matrix-db \
             -e POSTGRES_USER=synapse \