From 24a3c06a35a0926dc7a74994b0edd82b80b21d9a Mon Sep 17 00:00:00 2001 From: /rootzoll Date: Tue, 19 Mar 2024 00:05:00 +0100 Subject: [PATCH] Info about API/WebUI deactivation on fatpack provision (#4486) fixes #4468 --- home.admin/_provision_.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh index 81ace2945..71b2d20cc 100755 --- a/home.admin/_provision_.sh +++ b/home.admin/_provision_.sh @@ -183,21 +183,25 @@ sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info ########################## # PROVISIONING SERVICES ########################## -/home/admin/_cache.sh set message "Installing Services" + +echo "### CHECKING BLITZ-API/FRONT STATUS ###" >> ${logFile} +blitzApiInstalled=$(systemctl status blitzapi | grep -c "loaded") +echo "# blitzapi(${blitzapi}) blitzApiInstalled(${blitzApiInstalled})" +if [ "${blitzapi}" != "on" ] && [ ${blitzApiInstalled} -gt 0 ]; then + /home/admin/_cache.sh set message "Deactivated API/WebUI (as in your config) - please use SSH for further setup" + sleep 10 +else + /home/admin/_cache.sh set message "Installing Services" +fi # BLITZ WEB SERVICE 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