From b63775d0a25dc2b73f74d90a10b14e4bb423a0ab Mon Sep 17 00:00:00 2001
From: openoms <43343391+openoms@users.noreply.github.com>
Date: Sun, 14 Sep 2025 21:21:46 +0200
Subject: [PATCH] fix the use of the new bitcoin paths

---
 home.admin/99systemMenu.sh                          | 6 +++---
 home.admin/assets/bitcoin.conf                      | 8 ++++----
 home.admin/config.scripts/bitcoin.install.sh        | 6 +++---
 home.admin/config.scripts/blitz.i2pd.sh             | 6 +++---
 home.admin/config.scripts/bonus.btc-rpc-explorer.sh | 2 +-
 home.admin/config.scripts/bonus.mempool.sh          | 2 +-
 home.admin/config.scripts/bonus.specter.sh          | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/home.admin/99systemMenu.sh b/home.admin/99systemMenu.sh
index 9f98c5c0c..09f1bc0bf 100644
--- a/home.admin/99systemMenu.sh
+++ b/home.admin/99systemMenu.sh
@@ -64,11 +64,11 @@ case $CHOICE in
     ;;
   ${network}LOG)
     if [ ${CHAIN} = signet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/signet/debug.log"
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/signet/debug.log"
     elif [ ${CHAIN} = testnet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/testnet3/debug.log"
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/testnet3/debug.log"
     elif [ ${CHAIN} = mainnet ]; then
-      bitcoinlogpath="/mnt/hdd/bitcoin/debug.log"      
+      bitcoinlogpath="/mnt/hdd/app-data/bitcoin/debug.log"      
     fi
     clear
     echo
diff --git a/home.admin/assets/bitcoin.conf b/home.admin/assets/bitcoin.conf
index d4a134afe..50886250d 100755
--- a/home.admin/assets/bitcoin.conf
+++ b/home.admin/assets/bitcoin.conf
@@ -10,10 +10,10 @@ daemon=1
 txindex=0
 disablewallet=1
 peerbloomfilters=1
-datadir=/mnt/hdd/bitcoin
-main.debuglogfile=/mnt/hdd/bitcoin/debug.log
-test.debuglogfile=/mnt/hdd/bitcoin/testnet3/debug.log
-signet.debuglogfile=/mnt/hdd/bitcoin/signet/debug.log
+datadir=/mnt/hdd/app-storage/bitcoin
+main.debuglogfile=/mnt/hdd/app-data/bitcoin/debug.log
+test.debuglogfile=/mnt/hdd/app-data/bitcoin/testnet3/debug.log
+signet.debuglogfile=/mnt/hdd/app-data/bitcoin/signet/debug.log
 
 # Connection settings
 rpcuser=raspibolt
diff --git a/home.admin/config.scripts/bitcoin.install.sh b/home.admin/config.scripts/bitcoin.install.sh
index da42737bd..f65a5ac0b 100644
--- a/home.admin/config.scripts/bitcoin.install.sh
+++ b/home.admin/config.scripts/bitcoin.install.sh
@@ -44,11 +44,11 @@ elif [ ${CHAIN} = mainnet ]; then
 fi
 # bitcoinlogpath
 if [ ${CHAIN} = signet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/signet/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/signet/debug.log"
 elif [ ${CHAIN} = testnet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/testnet3/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/testnet3/debug.log"
 elif [ ${CHAIN} = mainnet ]; then
-  bitcoinlogpath="/mnt/hdd/app-storage/bitcoin/debug.log"
+  bitcoinlogpath="/mnt/hdd/app-data/bitcoin/debug.log"
 fi
 
 function addBitcoinAliases {
diff --git a/home.admin/config.scripts/blitz.i2pd.sh b/home.admin/config.scripts/blitz.i2pd.sh
index 68d7066fb..628bb9e0d 100644
--- a/home.admin/config.scripts/blitz.i2pd.sh
+++ b/home.admin/config.scripts/blitz.i2pd.sh
@@ -90,9 +90,9 @@ function add_repo {
 function bitcoinI2Pstatus {
   echo "# I2P related logs from the bitcoin debug log"
   echo "# Follow live with the command:"
-  echo "sudo tail -n 1000 -f /mnt/hdd/bitcoin/debug.log | grep i2p"
+  echo "sudo tail -n 1000 -f /mnt/hdd/app-data/bitcoin/debug.log | grep i2p"
   echo
-  sudo cat /mnt/hdd/bitcoin/debug.log | grep i2p
+  sudo cat /mnt/hdd/app-data/bitcoin/debug.log | grep i2p
   echo
   echo "# Running the command:"
   echo "bitcoin-cli -netinfo 4"
@@ -215,7 +215,7 @@ EOF
   echo "# Config: /etc/i2pd/i2pd.conf"
   echo "# i2pd web console: ${localip}:7070"
   echo "# Monitor i2p in bitcoind:"
-  echo "sudo tail -n 100 /mnt/hdd/bitcoin/debug.log | grep i2p"
+  echo "sudo tail -n 100 /mnt/hdd/app-data/bitcoin/debug.log | grep i2p"
   echo "bitcoin-cli -netinfo 4"
 
   exit 0
diff --git a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
index c107b4888..c5c0c71bd 100755
--- a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
+++ b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
@@ -390,7 +390,7 @@ EOF
   sudo /home/admin/config.scripts/blitz.conf.sh set BTCRPCexplorer "on"
 
   echo "# needs to finish creating txindex to be functional"
-  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/bitcoin/debug.log"
+  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/app-data/bitcoin/debug.log"
   echo "# npm audit fix"
   cd /home/btcrpcexplorer/btc-rpc-explorer/
   sudo npm audit fix
diff --git a/home.admin/config.scripts/bonus.mempool.sh b/home.admin/config.scripts/bonus.mempool.sh
index 2d0d18bda..dad27338f 100755
--- a/home.admin/config.scripts/bonus.mempool.sh
+++ b/home.admin/config.scripts/bonus.mempool.sh
@@ -376,7 +376,7 @@ EOF
   /home/admin/config.scripts/blitz.conf.sh set mempoolExplorer "on"
 
   echo "# needs to finish creating txindex to be functional"
-  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/bitcoin/debug.log"
+  echo "# monitor with: sudo tail -n 20 -f /mnt/hdd/app-data/bitcoin/debug.log"
 
   # Hidden Service for Mempool if Tor is active
   if [ "${runBehindTor}" = "on" ]; then
diff --git a/home.admin/config.scripts/bonus.specter.sh b/home.admin/config.scripts/bonus.specter.sh
index ae3e53549..5d4edcedc 100755
--- a/home.admin/config.scripts/bonus.specter.sh
+++ b/home.admin/config.scripts/bonus.specter.sh
@@ -410,7 +410,7 @@ EOF
       echo "# ${network}d is not running - so NOT restarting"
     fi
     echo "# The indexing takes ~10h on an RPi4 with SSD"
-    echo "# check with: sudo cat /mnt/hdd/bitcoin/debug.log | grep filter"
+    echo "# check with: sudo cat /mnt/hdd/app-data/bitcoin/debug.log | grep filter"
   else
     echo "# blockfilterindex is already active"
   fi