From 64e5f65eabdcc5d1e70c51cf7812da7c8a9c2e20 Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Fri, 11 Aug 2023 20:12:08 +0200
Subject: [PATCH] #3714 fix bitcoin setup (#4075)

* #3714 bitcoin service activation
---
 home.admin/_bootstrap.sh        | 24 ++++++++++++++++++++++++
 home.admin/_provision.setup.sh  |  2 +-
 home.admin/_provision.update.sh |  1 -
 home.admin/_provision_.sh       | 28 ----------------------------
 4 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 03ffc5148..ffdd1773c 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -744,6 +744,30 @@ if [ ${isMounted} -eq 0 ]; then
   echo "# setting PASSWORD A" >> ${logFile}
   sudo /home/admin/config.scripts/blitz.passwords.sh set a "${passwordA}" >> ${logFile}
 
+  # Bitcoin Mainnet
+  if [ "${mainnet}" == "on" ] || [ "${chain}" == "main" ]; then
+    echo "Provisioning ${network} Mainnet - run config script" >> ${logFile}
+    /home/admin/config.scripts/bitcoin.install.sh on mainnet >> ${logFile} 2>&1
+  else
+    echo "Provisioning ${network} Mainnet - not active" >> ${logFile}
+  fi
+
+  # Bitcoin Testnet
+  if [ "${testnet}" == "on" ]; then
+    echo "Provisioning ${network} Testnet - run config script" >> ${logFile}
+    /home/admin/config.scripts/bitcoin.install.sh on testnet >> ${logFile} 2>&1
+  else
+    echo "Provisioning ${network} Testnet - not active" >> ${logFile}
+  fi
+
+  # Bitcoin Signet
+  if [ "${signet}" == "on" ]; then
+    echo "Provisioning ${network} Signet - run config script" >> ${logFile}
+    /home/admin/config.scripts/bitcoin.install.sh on signet >> ${logFile} 2>&1
+  else
+    echo "Provisioning ${network} Signet - not active" >> ${logFile}
+  fi
+
   # if setup - run provision setup first
   if [ "${setupPhase}" == "setup" ]; then
     echo "Calling _provision.setup.sh for basic setup tasks .." >> $logFile
diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index d1c3a43e1..dc5da4935 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -117,7 +117,7 @@ echo ""
 echo "*** Start ${network} (SETUP) ***" >> ${logFile}
 /home/admin/_cache.sh set message "Blockchain Testrun"
 echo "- This can take a while .." >> ${logFile}
-cp /home/admin/assets/${network}d.service /etc/systemd/system/${network}d.service
+systemctl daemon-reload >> ${logFile}
 systemctl enable ${network}d.service
 systemctl start ${network}d.service
 
diff --git a/home.admin/_provision.update.sh b/home.admin/_provision.update.sh
index ba70cd960..8a3f36dfb 100755
--- a/home.admin/_provision.update.sh
+++ b/home.admin/_provision.update.sh
@@ -167,7 +167,6 @@ echo "*** Start ${network} (UPDATE) ***" >> ${logFile}
 /home/admin/_cache.sh set message "Blockchain Testrun"
 echo "- This can take a while .." >> ${logFile}
 chown -R bitcoin:bitcoin /mnt/hdd/${network} >>${logFile} 2>&1
-cp /home/admin/assets/${network}d.service /etc/systemd/system/${network}d.service
 systemctl daemon-reload >> ${logFile}
 systemctl enable ${network}d.service >> ${logFile}
 systemctl start ${network}d.service >> ${logFile}
diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh
index 0f642b1d5..a343131ca 100755
--- a/home.admin/_provision_.sh
+++ b/home.admin/_provision_.sh
@@ -265,34 +265,6 @@ else
   echo "Provisioning CL interims update - keep default" >> ${logFile}
 fi
 
-# Bitcoin Mainnet
-if [ "${mainnet}" == "on" ] || [ "${chain}" == "main" ]; then
-    echo "Provisioning ${network} Mainnet - run config script" >> ${logFile}
-    /home/admin/config.scripts/bitcoin.install.sh on mainnet >> ${logFile} 2>&1
-    systemctl start bitcoind >> ${logFile} 2>&1
-else
-    echo "Provisioning ${network} Mainnet - not active" >> ${logFile}
-fi
-
-
-# Bitcoin Testnet
-if [ "${testnet}" == "on" ]; then
-    echo "Provisioning ${network} Testnet - run config script" >> ${logFile}
-    /home/admin/config.scripts/bitcoin.install.sh on testnet >> ${logFile} 2>&1
-    systemctl start tbitcoind >> ${logFile} 2>&1
-else
-    echo "Provisioning ${network} Testnet - not active" >> ${logFile}
-fi
-
-# Bitcoin Signet
-if [ "${signet}" == "on" ]; then
-    echo "Provisioning ${network} Signet - run config script" >> ${logFile}
-    /home/admin/config.scripts/bitcoin.install.sh on signet >> ${logFile} 2>&1
-    systemctl start sbitcoind >> ${logFile} 2>&1
-else
-    echo "Provisioning ${network} Signet - not active" >> ${logFile}
-fi
-
 # LND binary install
 if [ "${lightning}" == "lnd" ] || [ "${lnd}" == "on" ] || [ "${tlnd}" == "on" ] || [ "${slnd}" == "on" ]; then
   # if already installed by fatpack will skip