From dcf64d97544c385f762af4709789aa838a1b3817 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sat, 28 Aug 2021 19:19:02 +0200
Subject: [PATCH] fix details for parallel servies

---
 home.admin/config.scripts/bitcoin.chains.sh |  1 +
 home.admin/config.scripts/blitz.debug.sh    | 64 +++++++++++++++------
 home.admin/config.scripts/cln.install.sh    |  1 +
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/home.admin/config.scripts/bitcoin.chains.sh b/home.admin/config.scripts/bitcoin.chains.sh
index 9bbebc400..c48028950 100644
--- a/home.admin/config.scripts/bitcoin.chains.sh
+++ b/home.admin/config.scripts/bitcoin.chains.sh
@@ -165,6 +165,7 @@ WantedBy=multi-user.target
  -${CHAIN}\"' \
       >> /home/admin/_aliases"
     fi
+    sudo chown admin:admin /home/admin/_aliases
   fi
 
   source /home/admin/raspiblitz.info
diff --git a/home.admin/config.scripts/blitz.debug.sh b/home.admin/config.scripts/blitz.debug.sh
index 6468ac6ed..b5956cd55 100755
--- a/home.admin/config.scripts/blitz.debug.sh
+++ b/home.admin/config.scripts/blitz.debug.sh
@@ -52,7 +52,7 @@ echo "*** BACKGROUNDSERVICE ***"
 echo "to monitor Background service call: sudo journalctl -f -u background"
 echo ""
 
-echo "*** BLOCKCHAIN SYSTEMD STATUS ***"
+echo "*** BLOCKCHAIN (MAINNET) SYSTEMD STATUS ***"
 sudo systemctl status ${network}d -n2 --no-pager
 echo ""
 echo "*** LAST BLOCKCHAIN ERROR LOGS ***"
@@ -61,11 +61,7 @@ sudo journalctl -u ${network}d -b --no-pager -n8
 cat /home/admin/systemd.blockchain.log | grep "ERROR" | tail -n -2
 echo ""
 echo "*** LAST BLOCKCHAIN 20 INFO LOGS ***"
-pathAdd=""
-if [ "${chain}" = "test" ]; then
-  pathAdd="/testnet3"
-fi
-echo "sudo tail -n 20 /mnt/hdd/${network}${pathAdd}/debug.log"
+echo "sudo tail -n 20 /mnt/hdd/${network}/debug.log"
 sudo tail -n 20 /mnt/hdd/${network}${pathAdd}/debug.log
 echo ""
 
@@ -86,6 +82,34 @@ else
 fi
 echo ""
 
+echo "*** C-LIGHTNING (MAINNET) SYSTEMD STATUS ***"
+if [ "${lightning}" == "cln" ] || [ "${cln}" == "on" ] || [ "${cln}" == "1" ]; then
+  sudo systemctl status lightningd -n2 --no-pager
+  echo ""
+  echo "*** LAST 30 C-LIGHTNING INFO LOGS ***"
+  echo "sudo tail -n 30 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log"
+  sudo tail -n 30 /home/bitcoin/.lightning/${network}/cl.log
+else
+  echo "- not activated -"
+fi
+echo ""
+
+echo "*** BLOCKCHAIN (TESTNET) SYSTEMD STATUS ***"
+if [ "${testnet}" == "on" ] || [ "${testnet}" == "1" ]; then
+  sudo systemctl status t${network}d -n2 --no-pager
+  echo ""
+  echo "*** LAST BLOCKCHAIN ERROR LOGS ***"
+  echo "sudo journalctl -u t${network}d -b --no-pager -n8"
+  sudo journalctl -u t${network}d -b --no-pager -n8
+  echo ""
+  echo "*** LAST BLOCKCHAIN 20 INFO LOGS ***"
+  echo "sudo tail -n 20 /mnt/hdd/${network}/testnet3/debug.log"
+  sudo tail -n 20 /mnt/hdd/${network}/testnet3/debug.log
+  echo ""
+else
+  echo "- OFF by config -"
+fi
+
 echo "*** LND (TESTNET) SYSTEMD STATUS ***"
 if [ "${tlnd}" == "on" ] || [ "${tlnd}" == "1" ]; then
   sudo systemctl status tlnd -n2 --no-pager
@@ -102,6 +126,22 @@ else
 fi
 echo ""
 
+echo "*** BLOCKCHAIN (SIGNET) SYSTEMD STATUS ***"
+if [ "${signet}" == "on" ] || [ "${signet}" == "1" ]; then
+  sudo systemctl status s${network}d -n2 --no-pager
+  echo ""
+  echo "*** LAST BLOCKCHAIN ERROR LOGS ***"
+  echo "sudo journalctl -u s${network}d -b --no-pager -n8"
+  sudo journalctl -u s${network}d -b --no-pager -n8
+  echo ""
+  echo "*** LAST BLOCKCHAIN 20 INFO LOGS ***"
+  echo "sudo tail -n 20 /mnt/hdd/${network}/signet/debug.log"
+  sudo tail -n 20 /mnt/hdd/${network}/signet/debug.log
+  echo ""
+else
+  echo "- OFF by config -"
+fi
+
 echo "*** LND (SIGNET) SYSTEMD STATUS ***"
 if [ "${slnd}" == "on" ] || [ "${slnd}" == "1" ]; then
   sudo systemctl status slnd -n2 --no-pager
@@ -118,18 +158,6 @@ else
 fi
 echo ""
 
-echo "*** C-LIGHTNING SYSTEMD STATUS ***"
-if [ "${lightning}" == "cln" ] || [ "${cln}" == "on" ] || [ "${cln}" == "1" ]; then
-  sudo systemctl status lightningd -n2 --no-pager
-  echo ""
-  echo "*** LAST 30 C-LIGHTNING INFO LOGS ***"
-  echo "sudo tail -n 30 /mnt/hdd/lnd/logs/${network}/${chain}net/lnd.log"
-  sudo tail -n 30 /home/bitcoin/.lightning/${network}/cl.log
-else
-  echo "- not activated -"
-fi
-echo ""
-
 echo "*** NGINX SYSTEMD STATUS ***"
 sudo systemctl status nginx -n2 --no-pager
 echo ""
diff --git a/home.admin/config.scripts/cln.install.sh b/home.admin/config.scripts/cln.install.sh
index e0032b12d..6f18d92ea 100644
--- a/home.admin/config.scripts/cln.install.sh
+++ b/home.admin/config.scripts/cln.install.sh
@@ -189,6 +189,7 @@ alias ${netprefix}clnlog=\"sudo\
 alias ${netprefix}clnconf=\"sudo\
  nano ${CLNCONF}\"
 " | sudo tee -a /home/admin/_aliases
+  sudo chown admin:admin /home/admin/_aliases
 
   echo "# The installed C-lightning version is: $(sudo -u bitcoin /usr/local/bin/lightningd --version)"
   echo