From 35a8bfc2c9543fa0dcfca774c6dcae392409b2a3 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Mon, 15 Aug 2022 09:42:52 -0400 Subject: [PATCH] BTCPay updates and rest. --- deploy.sh | 2 ++ deployment/btcpayserver/stub_btcpay_setup.sh | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3816eaf..9c80a92 100755 --- a/deploy.sh +++ b/deploy.sh @@ -295,6 +295,7 @@ function run_domain { export FQDN="$DDNS_HOST.$DOMAIN_NAME" export LXD_VM_NAME="${FQDN//./-}" export REMOTE_BACKUP_PATH="$REMOTE_BACKUP_PATH" + export RESTORE_WWW_USERDATA="$RESTORE_WWW_USERDATA" # This next section of if statements is our sanity checking area. if [ "$VPS_HOSTING_TARGET" = aws ]; then @@ -464,6 +465,7 @@ export DUPLICITY_BACKUP_PASSPHRASE="$(new_pass)" ## WWW export DEPLOY_WWW_SERVER=true +export WWW_SERVER_MAC_ADDRESS="CHANGE_ME_REQUIRED" # Deploy APPS to www export DEPLOY_GHOST=true diff --git a/deployment/btcpayserver/stub_btcpay_setup.sh b/deployment/btcpayserver/stub_btcpay_setup.sh index 36c3c9e..f36243d 100755 --- a/deployment/btcpayserver/stub_btcpay_setup.sh +++ b/deployment/btcpayserver/stub_btcpay_setup.sh @@ -42,12 +42,22 @@ export LETSENCRYPT_EMAIL="${CERTIFICATE_EMAIL_ADDRESS}" export BTCPAYGEN_LIGHTNING="clightning" export BTCPAYGEN_CRYPTO1="btc" -export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage;opt-add-btctransmuter;opt-add-nostr-relay;opt-add-tor-relay" -#export BTCPAYGEN_EXCLUDE_FRAGMENTS="nginx-https" +export BTCPAYGEN_ADDITIONAL_FRAGMENTS="opt-save-storage;opt-add-btctransmuter;opt-add-nostr-relay;" + export BTCPAY_ADDITIONAL_HOSTS="${BTCPAY_ADDITIONAL_HOSTNAMES}" export BTCPAYGEN_REVERSEPROXY="nginx" export BTCPAY_ENABLE_SSH=false export BTCPAY_BASE_DIRECTORY=${REMOTE_HOME} +EOL + +# can add opt-add-tor-relay; in BTCPAYGEN_ADDITIONAL_FRAGMENTS +if [ "$VPS_HOSTING_TARGET" = lxd ]; then +cat >> "$SITE_PATH/btcpay.sh" <> "$SITE_PATH/btcpay.sh" <