Merge branch 'v1.6' of https://github.com/rootzoll/raspiblitz into v1.6

FAQ.md

@@ -10,12 +10,14 @@
 - Update: Loop 0.6.4 [details](https://lightning.engineering/posts/2020-05-13-loop-mpp/)
 - Update: BTCPayServer v1.0.4.4+ [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.0.4.4)
 - New: RTL 0.7.1 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.7.1)
+- New: Nginx Web Server
 - New: Subscriptions Management 
 - New: IP2Tor Bridge (optional subscription service)
-- New: Balance of Satoshis [details](https://github.com/alexbosworth/balanceofsatoshis)
+- New: Balance of Satoshis v5.39.4 (with update option) [details](https://github.com/alexbosworth/balanceofsatoshis)
 - New: Faraday [details](https://github.com/lightninglabs/faraday)
 - New: Let's Encrypt client [details](FAQ.md#how-to-use-the-lets-encrypt-client)
-- New: ThunderHub 0.7.1 [details](https://www.thunderhub.io)
+- New: ThunderHub v0.8.0 (with update option) [details](https://www.thunderhub.io)
+- New: JoininBox (terminal based GUI for JoinMarket) [details](https://github.com/openoms/joininbox)
 - Fix: DropBox StaticChannelBackup
 - Shoppinglist: 4GB RaspberryPi 4 is now default for Standard Package (will still run with less) 
 

home.admin/_commands.sh

@@ -91,6 +91,29 @@ function torthistx() {
 }
 
 # command: status
+# start the status screen in the terminal
 function status() {
   sudo -u pi /home/admin/00infoLCD.sh
-}
+}
+
+# command: balance
+# switch to the bos user for Balance of Satoshis
+function balance() {
+  if [ $(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c "bos=on") -eq 1 ]; then
+    sudo su - bos
+  else
+    echo "Balance of Satoshis is not installed - to install run:"
+    echo "/home/admin/config.scripts/bonus.bos.sh on"
+  fi
+}
+
+# command: jmarket
+# switch to the joinmarket user for the JoininBox menu
+function jmarket() {
+  if [ $(cat /mnt/hdd/raspiblitz.conf 2>/dev/null | grep -c "joinmarket=on") -eq 1 ]; then
+    sudo su - joinmarket
+  else
+    echo "JoinMarket is not installed - to install run:"
+    echo "sudo /home/admin/config.scripts/bonus.joinmarket.sh on"
+  fi
+}

home.admin/config.scripts/bonus.bos.sh

@@ -58,7 +58,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   sudo /usr/sbin/usermod --append --groups lndadmin bos
   
   # install bos
-  sudo -u bos npm install -g balanceofsatoshis@5.36.0
+  sudo -u bos npm install -g balanceofsatoshis@5.39.4
 
   # setting value in raspi blitz config
   sudo sed -i "s/^bos=.*/bos=on/g" /mnt/hdd/raspiblitz.conf

home.admin/config.scripts/bonus.cryptoadvance-specter.sh

@@ -30,11 +30,13 @@ if [ "$1" = "menu" ]; then
     /home/admin/config.scripts/blitz.lcd.sh qr "${toraddress}"
     whiptail --title " Cryptoadvance Specter " --msgbox "Open the following URL in your local web browser:
 https://${localip}:25441
+
 You have to accept the self-signed-certificate.
 Login with the Pin being Password B. If you have connected to a different Bitcoin RPC Endpoint, the Pin is the configured RPCPassword.
+
 Hidden Service address for TOR Browser (QR see LCD):
 ${toraddress}\n
-" 16 70
+" 15 74
     /home/admin/config.scripts/blitz.lcd.sh hide
   else
 
@@ -236,7 +238,9 @@ EOF
   if [ "${runBehindTor}" = "on" ]; then
     echo "#    --> correct old Hidden Service with port"
     sudo sed -i "s/^HiddenServicePort 25441 127.0.0.1:25441/HiddenServicePort 80 127.0.0.1:25441/g" /etc/tor/torrc
-    /home/admin/config.scripts/internet.hiddenservice.sh cryptoadvance-specter 80 25441
+    sudo sed -i "s/^HiddenServicePort 25441 127.0.0.1:80/HiddenServicePort 443 127.0.0.1:25441/g" /etc/tor/torrc
+    # port 25441 is HTTPS with self-signed cert
+    /home/admin/config.scripts/internet.hiddenservice.sh cryptoadvance-specter 443 25441
   fi
   exit 0
 fi

home.admin/config.scripts/bonus.thunderhub.sh

@@ -81,7 +81,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     sudo -u thunderhub git clone https://github.com/apotdevin/thunderhub.git /home/thunderhub/thunderhub
     cd /home/thunderhub/thunderhub
     # https://github.com/apotdevin/thunderhub/releases
-    sudo -u thunderhub git reset --hard v0.7.8
+    sudo -u thunderhub git reset --hard v0.8.0
     echo "Running npm install and run build..."
     sudo -u thunderhub npm install
     sudo -u thunderhub npm run build