Suppress error messages and timing.

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.

deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 check_dependencies () {

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.

deployment/btcpayserver/go.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 export DOCKER_HOST="ssh://ubuntu@$BTCPAY_FQDN"

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:
 #

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."

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."

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

deployment/create_lxc_base.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -exu
+set -eu
 cd "$(dirname "$0")"
 
 ./stub_lxc_profile.sh sovereign-stack

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

deployment/provision_lxc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 ./stub_lxc_profile.sh "$LXD_VM_NAME"

deployment/provision_vps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 cd "$(dirname "$0")"
 
 if [ ! -f "$HOME/.aws/credentials" ]; then

deployment/run_ddns.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 DDNS_STRING=
 

deployment/stub_lxc_profile.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 LXD_HOSTNAME="$1"
 

deployment/wait_for_lxc_ip.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 LXC_INSTANCE_NAME="$1"
 IP_V4_ADDRESS=

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.

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.

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.

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)"

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

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

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

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"

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

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"

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

reset.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -x
+set -e
 
 SSH_ENDPOINT_HOSTNAME="atlantis"
 SSH_ENDPOINT_DOMAIN_NAME="ancapistan.io"