From 3616c9aecbaf931fd2e7300408a5f0e7544a863f Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Sat, 29 Oct 2022 11:34:17 -0400
Subject: [PATCH] Suppress error messages and timing.

---
 cluster.sh                                               | 2 +-
 deploy.sh                                                | 2 +-
 deployment/btcpayserver/backup_btcpay.sh                 | 2 +-
 deployment/btcpayserver/go.sh                            | 2 +-
 deployment/btcpayserver/remote_scripts/btcpay-backup.sh  | 2 +-
 deployment/btcpayserver/remote_scripts/btcpay-restore.sh | 2 +-
 deployment/btcpayserver/restore.sh                       | 6 +-----
 deployment/btcpayserver/stub_btcpay_setup.sh             | 4 ++--
 deployment/create_lxc_base.sh                            | 2 +-
 deployment/deploy_vms.sh                                 | 2 +-
 deployment/provision_lxc.sh                              | 2 +-
 deployment/provision_vps.sh                              | 2 +-
 deployment/run_ddns.sh                                   | 2 +-
 deployment/stub_lxc_profile.sh                           | 2 +-
 deployment/wait_for_lxc_ip.sh                            | 2 +-
 deployment/www/backup_path.sh                            | 2 +-
 deployment/www/generate_certs.sh                         | 2 +-
 deployment/www/go.sh                                     | 2 +-
 deployment/www/restore_path.sh                           | 2 +-
 deployment/www/stop_docker_stacks.sh                     | 6 ++++--
 deployment/www/stub/ghost_yml.sh                         | 2 +-
 deployment/www/stub/gitea_yml.sh                         | 2 +-
 deployment/www/stub/nextcloud_yml.sh                     | 4 +---
 deployment/www/stub/nginx_yml.sh                         | 2 +-
 domain_env.sh                                            | 2 +-
 install.sh                                               | 2 +-
 reset.sh                                                 | 2 +-
 27 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/cluster.sh b/cluster.sh
index b0a5795..f7aec91 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 # This script is meant to be executed on the management machine.
diff --git a/deploy.sh b/deploy.sh
index 89d1d01..12ec340 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 check_dependencies () {
diff --git a/deployment/btcpayserver/backup_btcpay.sh b/deployment/btcpayserver/backup_btcpay.sh
index f65e51a..39cfdc1 100755
--- a/deployment/btcpayserver/backup_btcpay.sh
+++ b/deployment/btcpayserver/backup_btcpay.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 cd "$(dirname "$0")"
 
 # take the services down, create a backup archive, then pull it down.
diff --git a/deployment/btcpayserver/go.sh b/deployment/btcpayserver/go.sh
index 33322b0..963a6b0 100755
--- a/deployment/btcpayserver/go.sh
+++ b/deployment/btcpayserver/go.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN"
diff --git a/deployment/btcpayserver/remote_scripts/btcpay-backup.sh b/deployment/btcpayserver/remote_scripts/btcpay-backup.sh
index 5ca43fd..4c3318d 100644
--- a/deployment/btcpayserver/remote_scripts/btcpay-backup.sh
+++ b/deployment/btcpayserver/remote_scripts/btcpay-backup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-set -o pipefail -o errexit -x
+set -o pipefail -o errexit
 
 # Please be aware of these important issues:
 #
diff --git a/deployment/btcpayserver/remote_scripts/btcpay-restore.sh b/deployment/btcpayserver/remote_scripts/btcpay-restore.sh
index 061b8f7..90bbb77 100644
--- a/deployment/btcpayserver/remote_scripts/btcpay-restore.sh
+++ b/deployment/btcpayserver/remote_scripts/btcpay-restore.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-set -o pipefail -o errexit -x
+set -o pipefail -o errexit
 
 if [ "$(id -u)" != "0" ]; then
   echo "ERROR: This script must be run as root."
diff --git a/deployment/btcpayserver/restore.sh b/deployment/btcpayserver/restore.sh
index e066255..ec7382b 100755
--- a/deployment/btcpayserver/restore.sh
+++ b/deployment/btcpayserver/restore.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-set -ex
+set -e
 cd "$(dirname "$0")"
 
-echo "ENTERING RESTORE SCRIPT."
-
 if [ -f "$BTCPAY_RESTORE_ARCHIVE_PATH" ]; then
     # push the restoration archive to the remote server
     echo "INFO: Restoring BTCPAY Server: $BTCPAY_RESTORE_ARCHIVE_PATH"
@@ -29,5 +27,3 @@ else
     echo "ERROR: File does not exist."
     exit 1
 fi
-
-echo "EXITING RESTORE script."
\ No newline at end of file
diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh
index 93e17f9..a6d76cc 100755
--- a/deployment/btcpayserver/stub_btcpay_setup.sh
+++ b/deployment/btcpayserver/stub_btcpay_setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 cd "$(dirname "$0")"
 
 # export BTCPAY_FASTSYNC_ARCHIVE_FILENAME="utxo-snapshot-bitcoin-testnet-1445586.tar"
@@ -11,7 +11,7 @@ cd "$(dirname "$0")"
 cat > "$SITE_PATH/btcpay.sh" <<EOL
 #!/bin/bash
 
-set -ex
+set -e
 cd "\$(dirname "\$0")"
 
 # wait for cloud-init to complete yo
diff --git a/deployment/create_lxc_base.sh b/deployment/create_lxc_base.sh
index 363e216..cc91add 100755
--- a/deployment/create_lxc_base.sh
+++ b/deployment/create_lxc_base.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 ./stub_lxc_profile.sh sovereign-stack
diff --git a/deployment/deploy_vms.sh b/deployment/deploy_vms.sh
index 38438dd..77d5230 100755
--- a/deployment/deploy_vms.sh
+++ b/deployment/deploy_vms.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 # let's make sure we have an ssh keypair. We just use $SSH_HOME/id_rsa
diff --git a/deployment/provision_lxc.sh b/deployment/provision_lxc.sh
index 1629a13..43ebdcf 100755
--- a/deployment/provision_lxc.sh
+++ b/deployment/provision_lxc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 ./stub_lxc_profile.sh "$LXD_VM_NAME"
diff --git a/deployment/provision_vps.sh b/deployment/provision_vps.sh
index 5d8b551..077cd92 100755
--- a/deployment/provision_vps.sh
+++ b/deployment/provision_vps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 if [ ! -f "$HOME/.aws/credentials" ]; then
diff --git a/deployment/run_ddns.sh b/deployment/run_ddns.sh
index da5714e..bbcf226 100755
--- a/deployment/run_ddns.sh
+++ b/deployment/run_ddns.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 DDNS_STRING=
 
diff --git a/deployment/stub_lxc_profile.sh b/deployment/stub_lxc_profile.sh
index 20758c0..f255fc9 100755
--- a/deployment/stub_lxc_profile.sh
+++ b/deployment/stub_lxc_profile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 LXD_HOSTNAME="$1"
 
diff --git a/deployment/wait_for_lxc_ip.sh b/deployment/wait_for_lxc_ip.sh
index cef8d96..576661f 100755
--- a/deployment/wait_for_lxc_ip.sh
+++ b/deployment/wait_for_lxc_ip.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 LXC_INSTANCE_NAME="$1"
 IP_V4_ADDRESS=
diff --git a/deployment/www/backup_path.sh b/deployment/www/backup_path.sh
index a797f87..936cba0 100755
--- a/deployment/www/backup_path.sh
+++ b/deployment/www/backup_path.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 # TODO: We are using extra space on the remote VPS at the moment for the duplicity backup files.
diff --git a/deployment/www/generate_certs.sh b/deployment/www/generate_certs.sh
index cb6c115..5dbde7d 100755
--- a/deployment/www/generate_certs.sh
+++ b/deployment/www/generate_certs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 
 # let's do a refresh of the certificates. Let's Encrypt will not run if it's not time.
diff --git a/deployment/www/go.sh b/deployment/www/go.sh
index c83ac9e..7b21f0c 100755
--- a/deployment/www/go.sh
+++ b/deployment/www/go.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 # Create the nginx config file which covers all domains.
diff --git a/deployment/www/restore_path.sh b/deployment/www/restore_path.sh
index c6bade7..ef5891c 100755
--- a/deployment/www/restore_path.sh
+++ b/deployment/www/restore_path.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 FILE_COUNT="$(find "$LOCAL_BACKUP_PATH" -type f | wc -l)"
diff --git a/deployment/www/stop_docker_stacks.sh b/deployment/www/stop_docker_stacks.sh
index 0d4d27c..ed6477c 100755
--- a/deployment/www/stop_docker_stacks.sh
+++ b/deployment/www/stop_docker_stacks.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 # bring down ghost instances.
@@ -59,9 +59,11 @@ if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
 
     # wait for all docker containers to stop.
     # TODO see if there's a way to check for this.
-    sleep 10
+    sleep 7
 
     docker system prune -f
+
+    sleep 2
 fi
 
 # generate the certs and grab a backup
diff --git a/deployment/www/stub/ghost_yml.sh b/deployment/www/stub/ghost_yml.sh
index 1594289..f26181b 100755
--- a/deployment/www/stub/ghost_yml.sh
+++ b/deployment/www/stub/ghost_yml.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
diff --git a/deployment/www/stub/gitea_yml.sh b/deployment/www/stub/gitea_yml.sh
index bb11825..4d44d3b 100755
--- a/deployment/www/stub/gitea_yml.sh
+++ b/deployment/www/stub/gitea_yml.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
diff --git a/deployment/www/stub/nextcloud_yml.sh b/deployment/www/stub/nextcloud_yml.sh
index d427231..a11a3b3 100755
--- a/deployment/www/stub/nextcloud_yml.sh
+++ b/deployment/www/stub/nextcloud_yml.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
-
-
 for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     export DOMAIN_NAME="$DOMAIN_NAME"
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
diff --git a/deployment/www/stub/nginx_yml.sh b/deployment/www/stub/nginx_yml.sh
index b48698e..eecca49 100755
--- a/deployment/www/stub/nginx_yml.sh
+++ b/deployment/www/stub/nginx_yml.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euox
+set -eu
 cd "$(dirname "$0")"
 
 #https://github.com/fiatjaf/expensive-relay
diff --git a/domain_env.sh b/domain_env.sh
index bbe55a1..73d0211 100755
--- a/domain_env.sh
+++ b/domain_env.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 # TODO, ensure VPS_HOSTING_TARGET is in range.
 export NEXTCLOUD_FQDN="$NEXTCLOUD_HOSTNAME.$DOMAIN_NAME"
diff --git a/install.sh b/install.sh
index 538d89b..78f5668 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 cd "$(dirname "$0")"
 
 # let's check to ensure the management machine is on the Baseline ubuntu 21.04
diff --git a/reset.sh b/reset.sh
index 524e10e..3df975b 100755
--- a/reset.sh
+++ b/reset.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -x
+set -e
 
 SSH_ENDPOINT_HOSTNAME="atlantis"
 SSH_ENDPOINT_DOMAIN_NAME="ancapistan.io"