mirrors/raspiblitz
1
0
Fork 0
mirror of https://github.com/rootzoll/raspiblitz.git synced 2025-02-28 16:58:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

#4182 deactivating API when installed but off (#4330)

Browse source
This commit is contained in:
/rootzoll 2023-12-19 17:00:48 +01:00 • committed by GitHub
parent 64e8b706ad
commit e70263dc30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
home.admin/_provision_.sh
View file

@ -190,6 +190,28 @@ sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
echo "Provisioning BLITZ WEB SERVICE - run config script" >> ${logFile} echo "Provisioning BLITZ WEB SERVICE - run config script" >> ${logFile}
/home/admin/config.scripts/blitz.web.sh https-on >> ${logFile} 2>&1 /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} echo "### RUNNING PROVISIONING SERVICES ###" >> ${logFile}
# BITCOIN INTERIMS UPDATE # BITCOIN INTERIMS UPDATE
@ -338,17 +360,6 @@ else
echo "Provisioning Tor - keep default" >> ${logFile} echo "Provisioning Tor - keep default" >> ${logFile}
fi 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 # AUTO PILOT
if [ "${autoPilot}" = "on" ]; then if [ "${autoPilot}" = "on" ]; then
echo "Provisioning AUTO PILOT - run config script" >> ${logFile} echo "Provisioning AUTO PILOT - run config script" >> ${logFile}