install integration

This commit is contained in:
/rootzoll 2020-02-10 20:44:41 +01:00
parent f97a42c636
commit f66d927ca5
5 changed files with 49 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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