From e5a22e8dc4f4bb7b7a5d5739919fde87822e0b33 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Fri, 22 Apr 2022 16:11:55 -0400
Subject: [PATCH] Various control updates.

Signed-off-by: Derek Smith <derek@farscapian.com>
---
 domain_init.sh      |  1 -
 go_www.sh           | 11 +++++------
 provision_vps.sh    |  2 --
 run_btcpay_setup.sh |  4 ++--
 shared.sh           | 10 ++++++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/domain_init.sh b/domain_init.sh
index 65ff50c..efd2674 100755
--- a/domain_init.sh
+++ b/domain_init.sh
@@ -67,7 +67,6 @@ elif [ "$VPS_HOSTING_TARGET" = lxd ]; then
     ./prepare_vps_host.sh
 fi
 
-# clear 
 
 # this tells our local docker client to target the remote endpoint via SSH
 export DOCKER_HOST="ssh://ubuntu@$FQDN"    
diff --git a/go_www.sh b/go_www.sh
index eae4db3..72c6eb9 100755
--- a/go_www.sh
+++ b/go_www.sh
@@ -1,20 +1,19 @@
 #!/bin/bash
 
-set -exuo nounset
-cd "$(dirname "$0")"
+set -exu
 
 TOR_CONFIG_PATH=
 
 ssh "$FQDN" mkdir -p "$REMOTE_HOME/ghost_site" "$REMOTE_HOME/ghost_db"
 
 if [ "$DEPLOY_NEXTCLOUD" = true ]; then
-    ssh "$FQDN" mkdir -p "$REMOTE_NEXTCLOUD_PATH/db/data" \
-    ssh "$FQDN" mkdir -p "$REMOTE_NEXTCLOUD_PATH/db/logs" \
-    ssh "$FQDN" mkdir -p "$REMOTE_NEXTCLOUD_PATH/html"
+    ssh "$FQDN" "mkdir -p $REMOTE_NEXTCLOUD_PATH/db/data"
+    ssh "$FQDN" "mkdir -p $REMOTE_NEXTCLOUD_PATH/db/logs"
+    ssh "$FQDN" "mkdir -p $REMOTE_NEXTCLOUD_PATH/html"
 fi
 
 if [ "$DEPLOY_GITEA" = true ]; then
-    ssh "$FQDN" mkdir -p "$REMOTE_GITEA_PATH/data" "$REMOTE_GITEA_PATH/db"
+    ssh "$FQDN" "mkdir -p $REMOTE_GITEA_PATH/data $REMOTE_GITEA_PATH/db"
 fi
 
 # enable docker swarm mode so we can support docker stacks.
diff --git a/provision_vps.sh b/provision_vps.sh
index b56c5c6..4afa9b9 100755
--- a/provision_vps.sh
+++ b/provision_vps.sh
@@ -3,8 +3,6 @@
 set -eux
 cd "$(dirname "$0")"
 
-
-
 if [ ! -f "$HOME/.aws/credentials" ]; then
 
     # TODO write a credential file baseline
diff --git a/run_btcpay_setup.sh b/run_btcpay_setup.sh
index a39b1fb..ec71977 100755
--- a/run_btcpay_setup.sh
+++ b/run_btcpay_setup.sh
@@ -56,5 +56,5 @@ EOL
 
 # send the setup script to the remote machine.
 scp "$SITE_PATH/btcpay.sh" "ubuntu@$FQDN:$REMOTE_HOME/btcpay_setup.sh"
-ssh "$FQDN" chmod 0744 "$REMOTE_HOME/btcpay_setup.sh"
-ssh "$FQDN" sudo bash -c ./btcpay_setup.sh
+ssh "$FQDN" "chmod 0744 $REMOTE_HOME/btcpay_setup.sh"
+ssh "$FQDN" "sudo bash -c ./btcpay_setup.sh"
diff --git a/shared.sh b/shared.sh
index e824ed7..5cd833e 100755
--- a/shared.sh
+++ b/shared.sh
@@ -23,8 +23,10 @@ if [ ! -f "$SITE_DEFINITION_PATH" ]; then
 
 export SITE_TITLE="Short Title of Project"
 export DOMAIN_NAME="domain.tld"
-export DDNS_PASSWORD="GET_SHARED_SECRET_FROM_DNS_PROVIDER"
-export SMTP_PASSWORD="GET_SHARED_SECRET_FROM_EMAIL_PROVIDER"
+export DDNS_PASSWORD=
+export SMTP_PASSWORD=
+
+# TODO VERIFY SECURE RNG
 export GHOST_MYSQL_PASSWORD="$(new_pass)"
 export GHOST_MYSQL_ROOT_PASSWORD="$(new_pass)"
 export NEXTCLOUD_MYSQL_PASSWORD="$(new_pass)"
@@ -35,6 +37,8 @@ export MATRIX_DB_PASSWORD="$(new_pass)"
 export MATRIX_SHARED_SECRET="$(new_pass)"
 export MATRIX_ADMIN_PASSWORD="$(new_pass)"
 export DUPLICITY_BACKUP_PASSPHRASE="$(new_pass)"
+#export DEPLOY_WWW_SERVER=false
+#export DEPLOY_BTCPAY_SERVER=false
 #export DEPLOY_UMBREL_VPS=false
 export DEPLOY_GHOST=true
 export DEPLOY_MATRIX=true
@@ -45,8 +49,6 @@ export DEPLOY_ONION_SITE=false
 #export BTC_CHAIN=testnet
 #export WWW_INSTANCE_TYPE="t2.medium"
 #export BTCPAY_ADDITIONAL_HOSTNAMES="pay.domain.tld"
-#export DEV_WWW_MAC_ADDRESS="00:16:3E:AD:25:2C"
-#export DEV_BTCPAY_MAC_ADDRESS="00:16:3E:AD:25:2D"
 
 EOL