Merge branch 'master' of https://github.com/rootzoll/raspiblitz

build_sdcard.sh

@@ -243,11 +243,14 @@ then
   echo "!!! FAIL !!! Download laanwj-releases.asc not success."
   exit 1
 fi
+gpg ./laanwj-releases.asc
 fingerprint=$(gpg ./laanwj-releases.asc 2>/dev/null | grep "${laanwjPGP}" -c)
 if [ ${fingerprint} -lt 1 ]; then
   echo ""
-  echo "!!! BUILD FAILED --> Bitcoin download PGP author not OK"
+  echo "!!! BUILD WARNING --> Bitcoin PGP author not as expected"
-  exit 1
+  echo "Should contain laanwjPGP: ${laanwjPGP}"
+  echo "PRESS ENTER to TAKE THE RISK if you think all is OK"
+  read key
 fi
 gpg --import ./laanwj-releases.asc
 sudo -u admin wget https://bitcoin.org/bin/bitcoin-core-${bitcoinVersion}/SHA256SUMS.asc
@@ -332,11 +335,14 @@ if [ "${binaryChecksum}" != "${lndSHA256}" ]; then
 fi
 
 # check gpg finger print
+gpg ./pgp_keys.asc
 fingerprint=$(gpg ./pgp_keys.asc 2>/dev/null | grep "${olaoluwaPGP}" -c)
 if [ ${fingerprint} -lt 1 ]; then
   echo ""
-  echo "!!! BUILD FAILED --> LND download author PGP not OK"
+  echo "!!! BUILD WARNING --> Bitcoin PGP author not as expected"
-  exit 1
+  echo "Should contain olaoluwaPGP: ${olaoluwaPGP}"
+  echo "PRESS ENTER to TAKE THE RISK if you think all is OK"
+  read key
 fi
 gpg --import ./pgp_keys.asc
 sleep 3

home.admin/config.scripts/lnd.setport.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# based on: https://github.com/rootzoll/raspiblitz/issues/100#issuecomment-465997126
+
+if [ $# -eq 0 ]; then
+ echo "small config script set the port LND is running on"
+ echo "lnd.setport.sh [portnumber]"
+ exit 1
+fi
+
+portnumber=$1
+
+# check port numer is a integer
+if ! [ "$portnumber" -eq "$portnumber" ] 2> /dev/null
+then
+  echo "FAIL - portnumber(${portnumber}) not a number"
+  exit 1
+fi
+
+# check port number is bigger then zero
+if [ ${portnumber} -lt 1 ]; then
+  echo "FAIL - portnumber(${portnumber}) not above 0"
+  exit 1
+fi
+
+# check port number is smaller than max
+if [ ${portnumber} -gt 65535 ]; then
+  echo "FAIL - portnumber(${portnumber}) not below 65535"
+  exit 1
+fi
+
+# check if TOR is on
+source /mnt/hdd/raspiblitz.conf
+if [ "${runBehindTor}" = "on" ]; then
+  echo "FAIL - portnumber cannot be changed if TOR is ON (not implemented)"
+  exit 1
+fi
+
+# check lnd.conf exits 
+lndConfExists=$(sudo ls /mnt/hdd/lnd/lnd.conf | grep -c 'lnd.conf')
+if [ ${lndConfExists} -eq 0 ]; then
+  echo "FAIL - /mnt/hdd/lnd/lnd.conf not found"
+  exit 1
+fi
+
+# check if "listen=" exists in lnd config
+valueExists=$(sudo cat /mnt/hdd/lnd/lnd.conf | grep -c 'listen=')
+if [ ${valueExists} -lt 3 ]; then
+  echo "Adding listen config defaults to /mnt/hdd/lnd/lnd.conf"
+  sudo sed -i "9i listen=0.0.0.0:9735" /mnt/hdd/lnd/lnd.conf
+fi
+
+# stop services
+echo "making sure LND is not running"
+sudo systemctl stop lnd 2>/dev/null
+
+# disable services
+echo "making sure LND is disabled"
+sudo systemctl disable lnd
+
+# change port in lnd config
+echo "change port in lnd config"
+sudo sed -i "s/^listen=.*/listen=0.0.0.0:${portnumber}/g" /mnt/hdd/lnd/lnd.conf
+
+# editing service file
+echo "editing /etc/systemd/system/lnd.service"
+sudo sed -i "s/^ExecStart=\/usr\/local\/bin\/lnd.*/ExecStart=\/usr\/local\/bin\/lnd --externalip=\${publicIP}:${portnumber}/g" /etc/systemd/system/lnd.service
+
+# enable service again
+echo "enable service again"
+sudo systemctl enable lnd
+
+# make sure port is open on firewall
+sudo ufw allow ${portnumber} comment 'LND Port'
+sudo ufw --force enable
+
+echo "needs reboot to activate new setting -> sudo shutdown -r now"