From 3c1b98587092d3c842b8afab053dcecb7ec8bbf5 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Wed, 2 Nov 2022 14:54:02 -0400
Subject: [PATCH] Updated BTCPAY_ALT_NAMES

---
 defaults.sh                                  | 1 +
 deploy.sh                                    | 6 +++---
 deployment/btcpayserver/stub_btcpay_setup.sh | 4 ++--
 staging/entrypoint.sh                        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/defaults.sh b/defaults.sh
index cb59daa..0a3442e 100755
--- a/defaults.sh
+++ b/defaults.sh
@@ -98,6 +98,7 @@ export BASE_LXC_IMAGE="ubuntu/22.04/cloud"
 # Deploy a registry cache on your management machine.
 export DEPLOY_MGMT_REGISTRY=false
 export OTHER_SITES_LIST=
+export BTCPAY_ALT_NAMES=
 
 export REMOTE_HOME="/home/ubuntu"
 
diff --git a/deploy.sh b/deploy.sh
index 332e04c..eabcfb0 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -391,9 +391,9 @@ function stub_site_definition {
 #!/bin/bash
 
 export DOMAIN_NAME="${DOMAIN_NAME}"
+#export BTCPAY_ALT_NAMES="tip,store,pay,send"
 export SITE_LANGUAGE_CODES="en"
 export DUPLICITY_BACKUP_PASSPHRASE="$(new_pass)"
-#export BTCPAY_HOSTNAME_IN_CERT="store"
 export DEPLOY_GHOST=true
 export DEPLOY_NEXTCLOUD=false
 export DEPLOY_NOSTR_RELAY=true
@@ -505,10 +505,10 @@ for DOMAIN_NAME in ${OTHER_SITES_LIST//,/ }; do
 done
 
 # now let's run the www and btcpay-specific provisioning scripts.
-if [ "$SKIP_WWW" = false ]; then
+if [ "$SKIP_WWW" = false ] && [ "$DEPLOY_BTCPAY_SERVER" = true ]; then
     bash -c "./deployment/www/go.sh"
 fi
 
-if [ "$SKIP_BTCPAY" = false ]; then
+if [ "$SKIP_BTCPAY" = false ] && [ "$DEPLOY_BTCPAY_SERVER" = true ]; then
     bash -c "./deployment/btcpayserver/go.sh"
 fi
diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh
index a6d76cc..c93c4aa 100755
--- a/deployment/btcpayserver/stub_btcpay_setup.sh
+++ b/deployment/btcpayserver/stub_btcpay_setup.sh
@@ -34,7 +34,7 @@ cd btcpayserver-docker
 
 export BTCPAY_HOST="${BTCPAY_USER_FQDN}"
 export NBITCOIN_NETWORK="${BTC_CHAIN}"
-export LIGHTNING_ALIAS="${DOMAIN_NAME}"
+export LIGHTNING_ALIAS="${PRIMARY_DOMAIN}"
 export BTCPAYGEN_LIGHTNING="clightning"
 export BTCPAYGEN_CRYPTO1="btc"
 export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage-s;opt-add-btctransmuter;opt-add-nostr-relay;"
@@ -67,5 +67,5 @@ ssh "$BTCPAY_FQDN" "chmod 0664 $REMOTE_HOME/.bashrc"
 # send the setup script to the remote machine.
 scp "$SITE_PATH/btcpay.sh" "ubuntu@$FQDN:$REMOTE_HOME/btcpay_setup.sh"
 ssh "$BTCPAY_FQDN" "chmod 0744 $REMOTE_HOME/btcpay_setup.sh"
-ssh "$BTCPAY_FQDN" "sudo bash -c ./btcpay_setup.sh"
+ssh "$BTCPAY_FQDN" "sudo bash -c $REMOTE_HOME/btcpay_setup.sh"
 ssh "$BTCPAY_FQDN" "touch $REMOTE_HOME/btcpay.complete"
diff --git a/staging/entrypoint.sh b/staging/entrypoint.sh
index 3b4238f..9805216 100644
--- a/staging/entrypoint.sh
+++ b/staging/entrypoint.sh
@@ -5,4 +5,4 @@ if [ -z "$DOMAIN_NAME" ]; then
     exit 1
 fi
 
-/sovereign-stack/deploy.sh --domain="$DOMAIN_NAME" --hosting-provider=lxd
+/sovereign-stack/deploy.sh --domain="$DOMAIN_NAME"
\ No newline at end of file