From 4f8147a78fc8770872e9c7bbd94586ae89fd5643 Mon Sep 17 00:00:00 2001
From: rootzoll <rotzoll@MacBook2020.fritz.box>
Date: Fri, 17 Jul 2020 18:13:58 +0200
Subject: [PATCH] recover now also BTCPayServer

---
 home.admin/_bootstrap.provision.sh            | 16 ++++------------
 .../config.scripts/bonus.btcpayserver.sh      | 19 +------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index d60c019ac..24e6263f3 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -284,19 +284,11 @@ else
   echo "Provisioning ElectRS - keep default" >> ${logFile}
 fi
 
-# BTCPAYSERVER - not restored due to need for domain name and port forwarding
+# BTCPAYSERVER 
 if [ "${BTCPayServer}" = "on" ]; then
-  # --> TODO: BTCPay Server install does not run clean during provision
-  # --> needs install when everything is already 'running'
-  #if [ "${runBehindTor}" = "on" ] && [ "${BTCPayDomain}" = "localhost" ]; then
-  #  echo "Provisioning BTCPAYSERVER on TOR - run config script" >> ${logFile}
-  #  sudo sed -i "s/^message=.*/message='Setup BTCPay (takes time)'/g" ${infoFile}
-  #  sudo -u admin /home/admin/config.scripts/bonus.btcpayserver.sh on tor >> ${logFile} 2>&1
-  #else
-    # provisioning non-TOR BTCPayServer is not supported yet - needs manual reinstall
-    echo "Setting BTCPayServer to be off - will need to be reinstalled from the menu again" >> ${logFile}
-    sudo sed -i "s/^BTCPayServer=.*/BTCPayServer=off/g" /mnt/hdd/raspiblitz.conf
-  #fi
+  echo "Provisioning BTCPAYSERVER on TOR - run config script" >> ${logFile}
+  sudo sed -i "s/^message=.*/message='Setup BTCPay (takes time)'/g" ${infoFile}
+  sudo -u admin /home/admin/config.scripts/bonus.btcpayserver.sh on >> ${logFile} 2>&1
 else
   echo "Provisioning BTCPayServer - keep default" >> ${logFile}
 fi
diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index baf1a9cac..d9b762fe1 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -5,7 +5,7 @@
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
   echo "config script to switch BTCPay Server on or off"
-  echo "bonus.btcpayserver.sh [on|off|menu|write-tls-macaroon] [ip|tor]"
+  echo "bonus.btcpayserver.sh [on|off|menu|write-tls-macaroon]"
   exit 1
 fi
 
@@ -170,23 +170,6 @@ fi
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   echo "*** INSTALL BTCPAYSERVER ***"
 
-  # --> just serving directly thru TOR for now
-  # setting up nginx and the SSL certificate
-  #/home/admin/config.scripts/bonus.btcpaysetdomain.sh
-  #errorOnInstall=$?
-  #if [ ${errorOnInstall} -eq 1 ]; then
-  # echo "exiting as user cancelled BTCPayServer installation"
-  # exit 1
-  #fi
-
-  #if [ "$2" == "tor" ]; then
-  #  sudo sed -i "s/^BTCPayDomain=.*/BTCPayDomain='localhost'/g" /mnt/hdd/raspiblitz.conf
-  #  /home/admin/config.scripts/internet.hiddenservice.sh btcpay 80 23000
-  #else
-  #  echo "# FAIL - at the moment only BTCPay Server over TOR is supported"
-  #  exit 1
-  #fi
-
   ##################
   # NGINX
   ##################