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

build_sdcard.sh

@@ -100,6 +100,8 @@ if [ "${baseImage}" = "raspbian" ] || [ "${baseImage}" = "dietpi" ] ; then
   # https://github.com/rootzoll/raspiblitz/issues/684
   sudo sed -i "s/^    SendEnv LANG LC.*/#   SendEnv LANG LC_*/g" /etc/ssh/ssh_config
 
+  # remove unneccesary files
+  sudo rm -rf /home/pi/MagPi 
 fi
 
 # remove some (big) packages that are not needed

home.admin/BlitzTUI/CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.46.1] - 2020-04-17
+### Added
+- remove LND config check
+
 ## [0.45.0] - 2020-01-25
 ### Added
 - clean up log statements

home.admin/BlitzTUI/blitztui/main.py

@@ -178,15 +178,6 @@ class AppWindow(QMainWindow):
         if not os.path.exists(rb_info_abs_path):
             log.warning("file does not exist: {}".format(rb_info_abs_path))
 
-        log.debug("init lnd.conf")
-        lnd_cfg_valid = False
-        self.lnd_cfg = LndConfig(lnd_cfg_abs_path)
-        try:
-            self.lnd_cfg.reload()
-            lnd_cfg_valid = True
-        except Exception as err:
-            pass
-
         log.debug("init raspiblitz.conf")
         rb_cfg_valid = False
         self.rb_cfg = RaspiBlitzConfig(rb_cfg_abs_path)
@@ -205,7 +196,7 @@ class AppWindow(QMainWindow):
         except Exception as err:
             pass
 
-        self.cfg_valid = lnd_cfg_valid and rb_cfg_valid and rb_info_valid
+        self.cfg_valid = rb_cfg_valid and rb_info_valid
         log.debug("checked cfg_valid with result: {}".format(self.cfg_valid))
 
     def check_invoice(self, flag, tick=0):
@@ -305,7 +296,6 @@ class AppWindow(QMainWindow):
 
     def update_watched_attr(self):
         log.debug("updating: watched attributes")
-        self.lnd_cfg.reload()
         self.rb_cfg.reload()
         self.rb_info.reload()
 

home.admin/BlitzTUI/blitztui/version.py

@@ -4,5 +4,5 @@
 # 3) we can import it into your module module
 """
 
-__version_info__ = ('0', '45', '0')
+__version_info__ = ('0', '46', '1')
 __version__ = '.'.join(__version_info__)

home.admin/config.scripts/blitz.configcheck.py

@@ -174,30 +174,6 @@ def main():
     # parse args
     args = parser.parse_args()
 
-
-    # LND Config
-    lnd_cfg_valid = False
-
-    lnd_cfg = LndConfig()
-    if os.path.exists(lnd_cfg.abs_path):
-        try:
-            lnd_cfg.reload()
-
-            lnd_cfg_valid = True
-            if not args.quiet:
-                print("LND Config: \t\tOK")
-        except Exception as err:
-            if not args.quiet:
-                print("LND Config: \t\tERROR")
-                log.warning(err)
-                print("# Use command to fix: sudo nano /mnt/hdd/lnd/lnd.conf")
-                print("# CTRL+o to save / CRTL+x to exit / then reboot")
-
-    else:
-        if not args.quiet:
-            print("LND Config: \t\tMISSING")
-
-
     # Raspi Config
     rb_cfg_valid = False
 
@@ -244,17 +220,6 @@ def main():
 
 
     if args.print:
-        print("=======\n= LND =\n=======")
-        if lnd_cfg_valid:
-            print("rpc_list: \t\t{}".format(lnd_cfg.rpc_listen))
-            print("rpc_list_host: \t\t{}".format(lnd_cfg.rpc_listen_host))
-            print("rpc_list_port: \t\t{}".format(lnd_cfg.rpc_listen_port))
-            print("")
-        else:
-            print("invalid or missing")
-            print("")
-
-
         print("====================\n= RaspiBlitzConfig =\n====================")
         if rb_cfg_valid:
             print("auto_nat_discovery: \t\t{}".format(rb_cfg.auto_nat_discovery))

home.admin/config.scripts/internet.tor.sh

@@ -257,6 +257,9 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     echo ""
 
     echo "*** Install Tor ***"
+    echo "*** Installing NYX - TOR monitoring Tool ***"
+    # NYX - Tor monitor tool
+    #  https://nyx.torproject.org/#home
     sudo apt install tor tor-arm -y
 
     echo ""
@@ -335,18 +338,7 @@ EOF
     sudo rm $torrc
     sudo mv ./torrc $torrc
     sudo chmod 644 $torrc
-    sudo chown -R bitcoin:bitcoin /var/run/tor/
-    echo ""
-
-    # NYX - Tor monitor tool
-    #  https://nyx.torproject.org/#home
-    echo "*** Installing NYX - TOR monitoring Tool ***"
-    nyxInstalled=$(sudo pip list 2>/dev/null | grep 'nyx' -c)
-    if [ ${nyxInstalled} -eq 0 ]; then
-      sudo pip install nyx
-    else
-      echo "NYX already installed"
-    fi
+    sudo chown -R bitcoin:bitcoin /var/run/tor/ 2>/dev/null
     echo ""
 
     echo "ReadWriteDirectories=-/mnt/hdd/tor" | sudo tee -a /lib/systemd/system/tor@default.service