mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-04-12 05:39:22 +02:00
* adding spacing line * prepare v1.7RC3 * fix lnbits macaroon write after reset * add IP2Tor renew info * fixing info * remove debug info * #2157 LNbits needs https for local * more info * reboot on macaroon reset * fix blocking LIT install * set correct fonts * set font for lcd * #2198 add connect Info * fix syntax * fix text layout * layout text * fix text layout * more install info * fix text layout * text layout * text layout * fix restart lnd * force lnd RPC/REST standard & open on boot * #2198 fix fully noded connection * #2198 deactivate Zap-Android from menu
This commit is contained in:
/rootzoll
GitHub
parent
8139024101
commit
eaa6993e5a
@ -131,10 +131,10 @@ checkIP2TOR()
|
||||
fi
|
||||
}
|
||||
|
||||
# Options
|
||||
OPTIONS=(ZAP_ANDROID "Zap Wallet (Android)" \
|
||||
# Also Zap-Android deactivated for now - see: https://github.com/rootzoll/raspiblitz/issues/2198#issuecomment-822808428
|
||||
#OPTIONS=(ZAP_ANDROID "Zap Wallet (Android)" \
|
||||
# ZAP_IOS "Zap Wallet (iOS)" \
|
||||
ZEUS_IOS "Zeus Wallet (iOS)" \
|
||||
OPTIONS=(ZEUS_IOS "Zeus Wallet (iOS)" \
|
||||
ZEUS_ANDROID "Zeus Wallet (Android)" \
|
||||
SPHINX "Sphinx Chat (Android or iOS)"
|
||||
)
|
||||
|
||||
@ -57,8 +57,8 @@ case $CHOICE in
|
||||
exit 0;;
|
||||
RESET)
|
||||
sudo /home/admin/config.scripts/lnd.credentials.sh reset
|
||||
echo "Press ENTER to return to main menu."
|
||||
read key
|
||||
sudo /home/admin/config.scripts/lnd.credentials.sh sync
|
||||
sudo /home/admin/XXshutdown.sh reboot
|
||||
exit 0;;
|
||||
SYNC)
|
||||
sudo /home/admin/config.scripts/lnd.credentials.sh sync
|
||||
|
||||
@ -85,7 +85,7 @@ case $CHOICE in
|
||||
Do you want to restart LND now?" 10 55
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "# Restarting LND"
|
||||
sudo systemctl restart ${network}d
|
||||
sudo systemctl restart lnd
|
||||
else
|
||||
echo "# Continue without restarting."
|
||||
fi
|
||||
|
||||
@ -203,6 +203,7 @@ if [ ${#undervoltageReports} -gt 0 ]; then
|
||||
showImproveInfo=1
|
||||
fi
|
||||
fi
|
||||
echo ""
|
||||
|
||||
echo "*** SYSTEM STATUS (can take some seconds to gather) ***"
|
||||
sudo /home/admin/config.scripts/blitz.statusscan.sh
|
||||
|
||||
@ -482,13 +482,18 @@ if [ ${configExists} -eq 1 ]; then
|
||||
|
||||
fi
|
||||
|
||||
######################################################################
|
||||
# MAKE SURE LND RPC/REST ports are standard & open to all connections
|
||||
######################################################################
|
||||
sudo sed -i "s/^rpclisten=.*/rpclisten=0.0.0.0:10009/g" /mnt/hdd/lnd/lnd.conf
|
||||
sudo sed -i "s/^restlisten=.*/restlisten=0.0.0.0:8080/g" /mnt/hdd/lnd/lnd.conf
|
||||
|
||||
#################################
|
||||
# FIX BLOCKCHAINDATA OWNER (just in case)
|
||||
# https://github.com/rootzoll/raspiblitz/issues/239#issuecomment-450887567
|
||||
#################################
|
||||
sudo chown bitcoin:bitcoin -R /mnt/hdd/bitcoin 2>/dev/null
|
||||
|
||||
|
||||
#################################
|
||||
# FIX BLOCKING FILES (just in case)
|
||||
# https://github.com/rootzoll/raspiblitz/issues/1901#issue-774279088
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
# RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
|
||||
codeVersion="1.7.0RC2"
|
||||
codeVersion="1.7.0RC3"
|
||||
|
||||
@ -238,6 +238,12 @@ function install_lcd() {
|
||||
|
||||
echo "# INSTALL 64bit LCD DRIVER"
|
||||
|
||||
# set font
|
||||
sudo sed -i "s/^CHARMAP=.*/CHARMAP=\"UTF-8\"/" /etc/default/console-setup
|
||||
sudo sed -i "s/^CODESET=.*/CODESET=\"guess\"/" /etc/default/console-setup
|
||||
sudo sed -i "s/^FONTFACE=.*/FONTFACE=\"TerminusBoldVGA\"/" /etc/default/console-setup
|
||||
sudo sed -i "s/^FONTSIZE=.*/FONTSIZE=\"8x16\"/" /etc/default/console-setup
|
||||
|
||||
# hold bootloader
|
||||
sudo apt-mark hold raspberrypi-bootloader
|
||||
|
||||
|
||||
@ -315,7 +315,7 @@ fi
|
||||
if [ "$1" = "export-gui" ]; then
|
||||
|
||||
# cleaning old migration files from blitz
|
||||
sudo rm ${defaultZipPath}/*.tar.gz
|
||||
sudo rm ${defaultZipPath}/*.tar.gz 2>/dev/null
|
||||
|
||||
# stopping lnd / bitcoin
|
||||
echo "--> stopping services ..."
|
||||
|
||||
@ -13,16 +13,16 @@ source /mnt/hdd/raspiblitz.conf
|
||||
RPC_USER=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcuser | cut -c 9-)
|
||||
PASSWORD_B=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcpassword | cut -c 13-)
|
||||
|
||||
if [ $(${chain}net) = mainnet ];then
|
||||
if [ "${chain}net" == "mainnet" ]; then
|
||||
BITCOINRPCPORT=8332
|
||||
elif [ $(${chain}net) = testnet ];then
|
||||
elif [ "${chain}net" == "testnet" ]; then
|
||||
BITCOINRPCPORT=18332
|
||||
elif [ $(${chain}net) = signet ];then
|
||||
elif [ "${chain}net" == "signet" ]; then
|
||||
BITCOINRPCPORT=38332
|
||||
fi
|
||||
|
||||
# check and set up the HS
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh bitcoin${BITCOINRPCPORT} ${BITCOINRPCPORT} ${BITCOINRPCPORT}
|
||||
/home/admin/config.scripts/internet.hiddenservice.sh bitcoin ${BITCOINRPCPORT} ${BITCOINRPCPORT}
|
||||
|
||||
hiddenService=$(sudo cat /mnt/hdd/tor/bitcoin${BITCOINRPCPORT}/hostname)
|
||||
|
||||
|
||||
@ -334,9 +334,10 @@ alias lit-frcli=\"frcli --rpcserver=localhost:8443 \
|
||||
echo "# OK - the litd.service is enabled, to start manually use: 'sudo systemctl start litd'"
|
||||
fi
|
||||
|
||||
# make Loop work with RTL if installed (update will run configRTL)
|
||||
# make Loop work with RTL if installed
|
||||
# dont call anything that starts RTL service - otherwise update/recover might block
|
||||
if [ ${#rtlWebinterface} -gt 0 ]&&[ ${rtlWebinterface} = on ];then
|
||||
/home/admin/config.scripts/bonus.rtl.sh update
|
||||
/home/admin/config.scripts/bonus.rtl.sh config
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
@ -33,7 +33,7 @@ if [ "$1" = "menu" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
text="Local Webrowser: http://${localIP}:${httpPort}"
|
||||
text="Local Webrowser: https://${localIP}:${httpsPort}"
|
||||
|
||||
if [ ${#publicDomain} -gt 0 ]; then
|
||||
text="${text}
|
||||
@ -42,7 +42,7 @@ port forwarding on router needs to be active & may change port"
|
||||
fi
|
||||
|
||||
text="${text}\n
|
||||
https://${localIP}:${httpsPort} with Fingerprint
|
||||
You need to accept self-signed HTTPS cert with SHA1 Fingerprint:
|
||||
${sslFingerprintIP}"
|
||||
|
||||
if [ "${runBehindTor}" = "on" ] && [ ${#toraddress} -gt 0 ]; then
|
||||
@ -178,6 +178,7 @@ if [ "$1" = "write-macaroons" ]; then
|
||||
#sudo sed -i "s|^LND_REST_INVOICE_MACAROON=.*|LND_REST_INVOICE_MACAROON=/home/lnbits/.lnd/data/chain/${network}/${chain}net/invoice.macaroon|g" /home/lnbits/lnbits/.env
|
||||
#sudo sed -i "s|^LND_REST_READ_MACAROON=.*|LND_REST_READ_MACAROON=/home/lnbits/.lnd/data/chain/${network}/${chain}net/read.macaroon|g" /home/lnbits/lnbits/.env
|
||||
echo "# OK - macaroons written to /home/lnbits/lnbits/.env"
|
||||
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
@ -52,6 +52,7 @@ port=""
|
||||
addcert=1
|
||||
supportsTOR=0
|
||||
usingIP2TOR=""
|
||||
connectInfo="When you start the App choose to connect to your own node.\n(DIY / Remote-Node / lndconnect)\nClick on the 'Scan QR' button."
|
||||
|
||||
if [ "${targetWallet}" = "zap-ios" ]; then
|
||||
if [ ${forceTOR} -eq 1 ]; then
|
||||
@ -71,9 +72,11 @@ if [ "${targetWallet}" = "zap-ios" ]; then
|
||||
fi
|
||||
|
||||
elif [ "${targetWallet}" = "zap-android" ]; then
|
||||
connectInfo="- start the Zap Wallet --> SETUP WALLET\n or choose new Wallet in app menu\n- scan the QR code \n- confirm host address"
|
||||
if [ ${forceTOR} -eq 1 ]; then
|
||||
# when ZAP runs on TOR it uses gRPC
|
||||
port="10009"
|
||||
connectInfo="${connectInfo}\n- install & connect Orbot App (VPN mode)"
|
||||
else
|
||||
# normal ZAP uses gRPC ports
|
||||
port="10009"
|
||||
@ -84,7 +87,7 @@ elif [ "${targetWallet}" = "zap-android" ]; then
|
||||
forceTOR=1
|
||||
host="${ip2torGRPC_IP}"
|
||||
port="${ip2torGRPC_PORT}"
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [ "${targetWallet}" = "zeus-ios" ]; then
|
||||
|
||||
@ -92,6 +95,7 @@ elif [ "${targetWallet}" = "zeus-ios" ]; then
|
||||
usingIP2TOR="LND-REST-API"
|
||||
forceTOR=1
|
||||
host=$(sudo cat /mnt/hdd/tor/lndrest8080/hostname)
|
||||
connectInfo="- start the Zeus Wallet --> lndconnect\n- scan the QR code \n- activate 'Tor' option \n- activate 'Certification Verification' option\n- save Node Config"
|
||||
|
||||
elif [ "${targetWallet}" = "zeus-android" ]; then
|
||||
|
||||
@ -99,6 +103,7 @@ elif [ "${targetWallet}" = "zeus-android" ]; then
|
||||
usingIP2TOR="LND-REST-API"
|
||||
forceTOR=1
|
||||
host=$(sudo cat /mnt/hdd/tor/lndrest8080/hostname)
|
||||
connectInfo="- start the Zeus Wallet --> lndconnect\n- scan the QR code \n- activate 'Tor' option \n- activate 'Certification Verification' option\n- save Node Config"
|
||||
|
||||
elif [ "${targetWallet}" = "sendmany-android" ]; then
|
||||
|
||||
@ -199,7 +204,7 @@ fi
|
||||
if [ ${#usingIP2TOR} -gt 0 ] && [ ${forceTOR} -eq 0 ]; then
|
||||
msg="Your IP2TOR bridge '${usingIP2TOR}' is used for this connection.\n\n"
|
||||
fi
|
||||
msg="You should now see the pairing QR code on the RaspiBlitz LCD.\n\n${msg}When you start the App choose to connect to your own node.\n(DIY / Remote-Node / lndconnect)\n\nClick on the 'Scan QR' button. Scan the QR on the LCD and <Continue> or <Console QRcode> to see it in this window."
|
||||
msg="You should now see the pairing QR code on the RaspiBlitz LCD.\n\n${msg}${connectInfo}\n\nIf your RaspiBlitz has no LCD use <Console QRcode>"
|
||||
whiptail --backtitle "Connecting Mobile Wallet" \
|
||||
--title "Pairing by QR code" \
|
||||
--yes-button "Continue" \
|
||||
|
||||
@ -4,7 +4,7 @@ RTLVERSION="v0.10.1"
|
||||
# command info
|
||||
if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
|
||||
echo "# config script to switch the RideTheLightning WebGUI on, off or update"
|
||||
echo "# bonus.rtl.sh [on|off|update<commit>|menu]"
|
||||
echo "# bonus.rtl.sh [on|off|update<commit>|menu|config]"
|
||||
echo "# installs the version $RTLVERSION by default"
|
||||
exit 1
|
||||
fi
|
||||
@ -278,6 +278,13 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# config
|
||||
if [ "$1" = "config" ]; then
|
||||
echo "# CONFIG RTL"
|
||||
configRTL
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# update
|
||||
if [ "$1" = "update" ]; then
|
||||
echo "# UPDATING RTL"
|
||||
|
||||
@ -26,7 +26,7 @@ if [ "$1" = "menu" ]; then
|
||||
whiptail --title " Warning " \
|
||||
--yes-button "Back" \
|
||||
--no-button "Continue Anyway" \
|
||||
--yesno "Your SPHINX SERVER may have problems (retry if just restarted).\n\nCheck if locally responding: http://${localIP}:${httpPort}/app\n(You should see 'INDEX' in your browser)\n\nCheck if service is reachable over Tor:\n${toraddress}/app\n\nAlso check logs with 'debug' on terminal." 16 72
|
||||
--yesno "Your SPHINX SERVER may have problems (retry if just restarted).\n\nCheck if locally responding: http://${localIP}:${httpPort}/app\n(You should see 'INDEX' in your browser)\n\nCheck if service is reachable over Tor:\n${toraddress}/app\n\nIf you use IP2TOR may cancel & renew subscription & LetsEncrypt.\nAlso check logs with 'debug' on terminal." 17 72
|
||||
if [ "$?" != "1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@ -108,6 +108,8 @@ if [ "$1" = "reset" ]; then
|
||||
echo "# OK DONE"
|
||||
fi
|
||||
|
||||
/home/admin/config.scripts/lnd.credentials.sh sync
|
||||
|
||||
###########################
|
||||
# SYNC
|
||||
###########################
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user