From 1de9431bb9385c8f1c61a00e98ff2791b711aa14 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 8 Sep 2021 23:52:31 +0200
Subject: [PATCH] change lnd password at end of provision

---
 home.admin/_provision.migration.sh | 11 -----------
 home.admin/_provision_.sh          | 10 ++++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/home.admin/_provision.migration.sh b/home.admin/_provision.migration.sh
index 665a7626e..befc6c84a 100755
--- a/home.admin/_provision.migration.sh
+++ b/home.admin/_provision.migration.sh
@@ -45,17 +45,6 @@ if [ "${err}" != "" ]; then
     exit 3
 fi
 
-# set password c if given in flag from migration prep
-passwordFlagExists=$(sudo ls /mnt/hdd/passwordc.flag | grep -c "passwordc.flag")
-if [ "${passwordFlagExists}" == "1" ]; then
-    echo "Found /mnt/hdd/passwordc.flag .. changing password" >> ${logFile}
-    oldPasswordC=$(sudo cat /mnt/hdd/passwordc.flag)
-    sudo /home/admin/config.scripts/lnd.initwallet.py change-password "${oldPasswordC}" "${passwordC}" >> ${logFile}
-    sudo shred -u /mnt/hdd/passwordc.flag    
-else
-    echo "No /mnt/hdd/passwordc.flag" >> ${logFile}
-fi
-
 # if free space is lower than 100GB (100000000) delete backup files
 if [ "${hddDataFreeKB}" != "" ] && [ ${hddDataFreeKB} -lt 407051412 ]; then
     echo "- free space of data disk is low ... deleting 'backup_migration'" >> ${logFile}
diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh
index d5b53d474..1fbd98bc8 100755
--- a/home.admin/_provision_.sh
+++ b/home.admin/_provision_.sh
@@ -776,6 +776,16 @@ echo "Make sure main services are running .." >> ${logFile}
 sudo systemctl start ${network}d
 if [ "${lightning}" == "lnd" ];then
   sudo systemctl start lnd
+  # set password c if given in flag from migration prep
+  passwordFlagExists=$(sudo ls /mnt/hdd/passwordc.flag | grep -c "passwordc.flag")
+  if [ "${passwordFlagExists}" == "1" ]; then
+    echo "Found /mnt/hdd/passwordc.flag .. changing password" >> ${logFile}
+    oldPasswordC=$(sudo cat /mnt/hdd/passwordc.flag)
+    sudo /home/admin/config.scripts/lnd.initwallet.py change-password "${oldPasswordC}" "${passwordC}" >> ${logFile}
+    sudo shred -u /mnt/hdd/passwordc.flag    
+  else
+    echo "No /mnt/hdd/passwordc.flag" >> ${logFile}
+  fi
 elif [ "${lightning}" == "cln" ];then
   sudo systemctl start lightningd
 fi