From e70263dc3066d4c44ed1124b4d723699351856ad Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Tue, 19 Dec 2023 17:00:48 +0100
Subject: [PATCH] #4182 deactivating API when installed but off (#4330)

---
 home.admin/_provision_.sh | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh
index cd1b8f202..1b18dd4cd 100755
--- a/home.admin/_provision_.sh
+++ b/home.admin/_provision_.sh
@@ -190,6 +190,28 @@ sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
 echo "Provisioning BLITZ WEB SERVICE - run config script" >> ${logFile}
 /home/admin/config.scripts/blitz.web.sh https-on >> ${logFile} 2>&1
 
+echo "### CHECKING BLITZ-API/FRONT STATUS ###" >> ${logFile}
+blitzApiInstalled=$(systemctl status blitzapi | grep -c "loaded")
+echo "# blitzapi(${blitzapi}) blitzApiInstalled(${blitzApiInstalled})"
+
+# deinstall when not explizit 'on' when blitzapi is installed by fatpack
+# https://github.com/raspiblitz/raspiblitz/issues/4171#issuecomment-1728302628
+if [ "${blitzapi}" != "on" ] && [ ${blitzApiInstalled} -gt 0 ]; then
+  echo "blitz_api directory exists & blitzapi is not 'on' - deactivating blitz-api" >> ${logFile}
+  /home/admin/_cache.sh set message "Deactivate API/WebUI"
+  /home/admin/config.scripts/blitz.web.api.sh off >> ${logFile} 2>&1
+  /home/admin/config.scripts/blitz.web.ui.sh off >> ${logFile} 2>&1
+fi
+# WebAPI & UI (in case image was not fatpack - but webapi was switchen on)
+if [ "${blitzapi}" == "on" ] && [ $blitzApiInstalled -eq 0 ]; then
+    echo "Provisioning BlitzAPI - run config script" >> ${logFile}
+    /home/admin/_cache.sh set message "Setup BlitzAPI (takes time)"
+    /home/admin/config.scripts/blitz.web.api.sh on DEFAULT >> ${logFile} 2>&1
+    /home/admin/config.scripts/blitz.web.ui.sh on DEFAULT >> ${logFile} 2>&1
+else
+    echo "Provisioning BlitzAPI - keep default" >> ${logFile}
+fi
+
 echo "### RUNNING PROVISIONING SERVICES ###" >> ${logFile}
 
 # BITCOIN INTERIMS UPDATE
@@ -338,17 +360,6 @@ else
     echo "Provisioning Tor - keep default" >> ${logFile}
 fi
 
-# WebAPI & UI (in case image was not fatpack - but webapi was switchen on)
-blitzApiInstalled=$(systemctl status blitzapi | grep -c "loaded")
-if [ "${blitzapi}" == "on" ] && [ $blitzApiInstalled -eq 0 ]; then
-    echo "Provisioning BlitzAPI - run config script" >> ${logFile}
-    /home/admin/_cache.sh set message "Setup BlitzAPI (takes time)"
-    /home/admin/config.scripts/blitz.web.api.sh on DEFAULT >> ${logFile} 2>&1
-    /home/admin/config.scripts/blitz.web.ui.sh on DEFAULT >> ${logFile} 2>&1
-else
-    echo "Provisioning BlitzAPI - keep default" >> ${logFile}
-fi
-
 # AUTO PILOT
 if [ "${autoPilot}" = "on" ]; then
     echo "Provisioning AUTO PILOT - run config script" >> ${logFile}