Activate i2p more reliably (#4265)

* move the i2p setup after the last bitcoin.conf check
* redo config even if i2p is active

home.admin/_provision_.sh

@@ -210,11 +210,6 @@ else
   echo "Provisioning Bitcoin Core interims update - keep default" >> ${logFile}
 fi
 
-# I2P
-echo "Start i2pd" >> ${logFile}
-/home/admin/_cache.sh set message "i2pd setup"
-/home/admin/config.scripts/blitz.i2pd.sh on >> ${logFile}
-
 # LND INTERIMS UPDATE
 if [ ${#lndInterimsUpdate} -gt 0 ]; then
   /home/admin/_cache.sh set message "Provisioning LND update"
@@ -811,6 +806,11 @@ if [ ${confExists} -eq 0 ]; then
   chown bitcoin:bitcoin /mnt/hdd/bitcoin/bitcoin.conf
 fi
 
+# I2P
+echo "Start i2pd" >> ${logFile}
+/home/admin/_cache.sh set message "i2pd setup"
+/home/admin/config.scripts/blitz.i2pd.sh on >> ${logFile}
+
 # signal setup done
 /home/admin/_cache.sh set message "Setup Done"
 

home.admin/config.scripts/blitz.i2pd.sh

@@ -107,7 +107,6 @@ function bitcoinI2Pstatus {
   echo
 }
 
-
 echo "# Running: 'blitz.i2pd.sh $*'"
 source /mnt/hdd/raspiblitz.conf
 
@@ -145,11 +144,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 
   if systemctl is-active --quiet i2pd.service; then
     echo "# i2pd.service is already active."
-    exit 0
-  fi
-
+  else
     echo "# sudo systemctl enable i2pd"
     sudo systemctl enable i2pd
+  fi
 
   echo "# i2pd config"
   /home/admin/config.scripts/blitz.conf.sh set debug tor /mnt/hdd/bitcoin/bitcoin.conf noquotes
@@ -212,6 +210,7 @@ EOF
   # setting value in raspiblitz.conf
   /home/admin/config.scripts/blitz.conf.sh set i2pd "on"
 
+  localip=$(hostname -I | awk '{print $1}')
   echo "# Config: /etc/i2pd/i2pd.conf"
   echo "# i2pd web console: ${localip}:7070"
   echo "# Monitor i2p in bitcoind:"