From f66d927ca5e409dc4091b9a07c591f0813c733b1 Mon Sep 17 00:00:00 2001
From: /rootzoll <rootzoll@MacBookAir512.fritz.box>
Date: Mon, 10 Feb 2020 20:44:41 +0100
Subject: [PATCH] install integration

---
 home.admin/00mainMenu.sh             |  9 ++++++++-
 home.admin/00settingsMenuServices.sh | 17 +++++++++++++++++
 home.admin/XXdebugLogs.sh            | 10 ++++++++++
 home.admin/_bootstrap.provision.sh   |  9 +++++++++
 home.admin/_bootstrap.sh             |  5 +++++
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/home.admin/00mainMenu.sh b/home.admin/00mainMenu.sh
index 3c5d92551..e6eff1f56 100755
--- a/home.admin/00mainMenu.sh
+++ b/home.admin/00mainMenu.sh
@@ -48,10 +48,13 @@ fi
 if [ "${BTCRPCexplorer}" == "on" ]; then
   OPTIONS+=(EXPLORE "BTC RPC Explorer")  
 fi
+if [ "${LNBits}" == "on" ]; then
+  OPTIONS+=(LNBITS "LNBits Server")  
+fi
 if [ "${lndmanage}" == "on" ]; then
   OPTIONS+=(LNDMANAGE "LND Manage Script")  
 fi
-if [ "${lndmanage}" == "on" ]; then
+if [ "${loop}" == "on" ]; then
   OPTIONS+=(LOOP "Loop In/Out Service")  
 fi
 
@@ -157,6 +160,10 @@ case $CHOICE in
             /home/admin/config.scripts/bonus.electrs.sh menu
             ./00mainMenu.sh
             ;;
+        LNBITS)
+            /home/admin/config.scripts/bonus.lnbits.sh menu
+            ./00mainMenu.sh
+            ;;
         LNDMANAGE)
             /home/admin/config.scripts/bonus.lndmanage.sh menu
             ./00mainMenu.sh
diff --git a/home.admin/00settingsMenuServices.sh b/home.admin/00settingsMenuServices.sh
index 531b607cd..eb5ade5d1 100644
--- a/home.admin/00settingsMenuServices.sh
+++ b/home.admin/00settingsMenuServices.sh
@@ -20,6 +20,7 @@ if [ ${#lcdrotate} -eq 0 ]; then lcdrotate=0; fi
 if [ ${#BTCPayServer} -eq 0 ]; then BTCPayServer="off"; fi
 if [ ${#ElectRS} -eq 0 ]; then ElectRS="off"; fi
 if [ ${#lndmanage} -eq 0 ]; then lndmanage="off"; fi
+if [ ${#LNBits} -eq 0 ]; then LNBits="off"; fi
 
 echo "map chain to on/off"
 chainValue="off"
@@ -71,6 +72,7 @@ r 'LCD Rotate' ${lcdrotateMenu} \
 e 'Electrum Rust Server' ${ElectRS} \
 p 'BTCPayServer' ${BTCPayServer} \
 m 'lndmanage' ${lndmanage} \
+i 'LNBits' ${LNBits} \
 2>&1 >/dev/tty)
 else
 CHOICES=$(dialog --title ' Additional Services ' --checklist ' use spacebar to activate/de-activate ' 22 45 14 \
@@ -89,6 +91,7 @@ r 'LCD Rotate' ${lcdrotateMenu} \
 e 'Electrum Rust Server' ${ElectRS} \
 p 'BTCPayServer' ${BTCPayServer} \
 m 'lndmanage' ${lndmanage} \
+i 'LNBits' ${LNBits} \
 2>&1 >/dev/tty)
 fi
 
@@ -491,6 +494,20 @@ else
   echo "lndmanage setting unchanged."
 fi
 
+# LNBits process choice
+choice="off"; check=$(echo "${CHOICES}" | grep -c "m")
+if [ ${check} -eq 1 ]; then choice="on"; fi
+if [ "${LNBits}" != "${choice}" ]; then
+  echo "LNBits Setting changed .."
+  anychange=1
+  sudo -u admin /home/admin/config.scripts/bonus.lnbits.sh ${choice}
+  if [ "${choice}" =  "on" ]; then
+    sudo -u admin /home/admin/config.scripts/bonus.lnbits.sh menu
+  fi
+else 
+  echo "lndmanage setting unchanged."
+fi
+
 if [ ${anychange} -eq 0 ]; then
      dialog --msgbox "NOTHING CHANGED!\nUse Spacebar to check/uncheck services." 8 58
      exit 0
diff --git a/home.admin/XXdebugLogs.sh b/home.admin/XXdebugLogs.sh
index 61e297ad8..d48198127 100644
--- a/home.admin/XXdebugLogs.sh
+++ b/home.admin/XXdebugLogs.sh
@@ -124,6 +124,16 @@ else
   echo ""
 fi
 
+if [ "${LNBits}" = "on" ]; then
+  echo "*** LAST 20 LNBits LOGS ***"
+  echo "sudo journalctl -u lnbits -b --no-pager -n20"
+  sudo journalctl -u lnbits -b --no-pager -n20
+  echo ""
+else
+  echo "- LNBits is OFF by config"
+  echo ""
+fi
+
 echo "*** HARDWARE TEST RESULTS ***"
 showImproveInfo=0
 if [ ${#undervoltageReports} -gt 0 ]; then
diff --git a/home.admin/_bootstrap.provision.sh b/home.admin/_bootstrap.provision.sh
index c29df65e1..0baa80048 100644
--- a/home.admin/_bootstrap.provision.sh
+++ b/home.admin/_bootstrap.provision.sh
@@ -350,6 +350,15 @@ else
     echo "Provisioning UPS - not active" >> ${logFile}
 fi
 
+# LNBits
+if [ "${LNBits}" = "on" ]; then
+  echo "Provisioning LNBits - run config script" >> ${logFile}
+  sudo sed -i "s/^message=.*/message='Setup LNBits '/g" ${infoFile}
+  sudo -u admin /home/admin/config.scripts/bonus.lnbits.sh on >> ${logFile} 2>&1
+else
+  echo "Provisioning LNBits - keep default" >> ${logFile}
+fi
+
 # replay backup LND conf & tlscerts
 # https://github.com/rootzoll/raspiblitz/issues/324
 echo "" >> ${logFile}
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 6f43df257..cb3e98f69 100644
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -431,6 +431,11 @@ if [ ${#network} -gt 0 ] && [ ${#chain} -gt 0 ]; then
   sudo sh -c "cat /mnt/hdd/lnd/data/chain/${network}/${chain}net/invoice.macaroon > /home/pi/.lnd/data/chain/${network}/${chain}net/invoice.macaroon" 2>> $logFile
   sudo chown pi:pi -R /home/pi/.lnd 2>> $logFile
 
+  if [ "${LNBits}" = "on" ]; then
+    echo "updating macaroons for LNBits fresh on start" >> $logFile
+    sudo -u admin /home/admin/config.scripts/bonus.lnbits.sh write-macaroons >> $logFile
+  fi
+
 else 
   echo "skipping admin user LND data update" >> $logFile
 fi