From 0aa9649c28e86590db2b81d3b781974d722ef8bc Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Tue, 28 Jan 2020 00:51:44 +0000
Subject: [PATCH 1/2] btcpay:improve guidance on install

---
 .../config.scripts/bonus.btcpayserver.sh      |  8 ++++----
 .../config.scripts/bonus.btcpaysetdomain.sh   | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index c126c37d8..2a6a5601c 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -23,11 +23,11 @@ if [ "$1" = "menu" ]; then
     # TOR
     /home/admin/config.scripts/blitz.lcd.sh qr "${toraddress}"
     whiptail --title " BTCPay Server (TOR) " --msgbox "Open the following URL in your local web browser:
-https://${localip}:23001
-You need to accept the selfsigned certificate in browser.\n
-Hidden Service address for TOR Browser (QR see LCD):
+https://${localip}
+You will need to accept the selfsigned certificate in the browser.\n
+Hidden Service address for Tor Browser (see the LCD for a QRcode):
 ${toraddress}
-" 12 67
+" 12 70
     /home/admin/config.scripts/blitz.lcd.sh hide
   else
 
diff --git a/home.admin/config.scripts/bonus.btcpaysetdomain.sh b/home.admin/config.scripts/bonus.btcpaysetdomain.sh
index 9d5b6379d..2008ad01d 100644
--- a/home.admin/config.scripts/bonus.btcpaysetdomain.sh
+++ b/home.admin/config.scripts/bonus.btcpaysetdomain.sh
@@ -79,22 +79,33 @@ echo "***"
 echo ""
 
 if [ $ownDomain -eq 1 ]; then
+  localip=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
   echo ""
   echo "***"
-  echo "Confirm that the ports 443 and 9735 are forwarded to the IP of your RaspiBlitz AND the port 80 on your router forwards to port 23001 of your RaspiBlitz by pressing [ENTER] or use [CTRL + C] to exit"
+  echo "Confirm that the ports 443 and 9735 are open on your router" 
+  echo "AND the port 80 points to the port 23001 of your RaspiBlitz."
+  echo ""
+  echo "Press [ENTER] to continue or use [CTRL + C] to exit"
+  echo ""
+  echo "Example settings for your router:"
+  echo "forward the port 443 to port 443 on ${localip}"
+  echo "forward the port 9735 to port 9735 on ${localip}"
+  echo "forward the port 80 to port 23001 on ${localip}"
   read key
   
   echo ""
   echo "***"
   echo "Type your domain or dynamicDNS pointing to your public IP and press [ENTER] or use [CTRL + C] to exit"
-  echo "example:"
+  echo ""
+  echo "Example:"
   echo "btcpay.example.com"
   read YOUR_DOMAIN
 
   echo ""
   echo "***"
-  echo "Type an email address that will be used to message about the SSL certificate and press [ENTER] or use [CTRL + C] to exit"
-  echo "example:"
+  echo "Type an email address that will be used to message about the expiration of the SSL certificate and press [ENTER] or use [CTRL + C] to exit"
+  echo ""
+  echo "Example:"
   echo "name@email.com"
   read YOUR_EMAIL
   

From 9f48aeaedc51dc62d3a73fbb29b7ee2cee8aed89 Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Wed, 29 Jan 2020 07:29:49 +0000
Subject: [PATCH 2/2] Update bonus.btcpayserver.sh

---
 home.admin/config.scripts/bonus.btcpayserver.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index 421061aed..b39d187ab 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -22,7 +22,6 @@ if [ "$1" = "menu" ]; then
 
     # TOR
     /home/admin/config.scripts/blitz.lcd.sh qr "${toraddress}"
-
     whiptail --title " BTCPay Server (TOR) " --msgbox "Have TOR Browser installed on your laptop and open:\n
 ${toraddress}\n
 See LCD of RaspiBlitz for QR code of this address if you want to open on mobile devices with TOR browser.