From c63f424c7df93dfd003ef45287a0d6f60c0646ae Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Fri, 24 Jan 2025 20:05:42 +1100
Subject: [PATCH] LOADED_PLUGINS docker variable #975

---
 docker-compose.yml   |  1 +
 dockerfiles/init.sh  | 11 +++++++++--
 server/initialise.py |  3 +--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 165c3930..75f83f5e 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,4 +71,5 @@ services:
       - PORT=${PORT}      
       # ❗ DANGER ZONE BELOW - Setting ALWAYS_FRESH_INSTALL=true will delete the content of the /db & /config folders
       - ALWAYS_FRESH_INSTALL=${ALWAYS_FRESH_INSTALL}
+      # - LOADED_PLUGINS=["DHCPLSS","PIHOLE","ASUSWRT","FREEBOX"]
       
diff --git a/dockerfiles/init.sh b/dockerfiles/init.sh
index 4d2996e0..e2a41244 100755
--- a/dockerfiles/init.sh
+++ b/dockerfiles/init.sh
@@ -55,7 +55,7 @@ else
   echo "Config file saved to ${INSTALL_DIR}/config/app_conf_override.json"
 fi
 
-# 🔻 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2024
+# 🔻 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2025
 
 # Check if pialert.db exists, then create a symbolic link to app.db
 if [ -f "${INSTALL_DIR_OLD}/db/${OLD_APP_NAME}.db" ]; then
@@ -66,7 +66,7 @@ fi
 if [ -f "${INSTALL_DIR_OLD}/config/${OLD_APP_NAME}.conf" ]; then
     ln -s "${INSTALL_DIR_OLD}/config/${OLD_APP_NAME}.conf" "${INSTALL_DIR}/config/${CONF_FILE}"
 fi
-# 🔺 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2024
+# 🔺 FOR BACKWARD COMPATIBILITY - REMOVE AFTER 12/12/2025
 
 # Copy starter .db and .conf if they don't exist
 cp -na "${INSTALL_DIR}/back/${CONF_FILE}" "${INSTALL_DIR}/config/${CONF_FILE}"
@@ -83,6 +83,13 @@ if [ -n "${TZ}" ]; then
   echo $TZ > /etc/timezone
 fi
 
+# if custom variables not set we do not need to do anything
+if [ -n "${LOADED_PLUGINS}" ]; then
+  FILECONF="${INSTALL_DIR}/config/${CONF_FILE}"
+  echo "[INSTALL] Setup custom LOADED_PLUGINS variable"
+  sed -i "\#^LOADED_PLUGINS=#c\LOADED_PLUGINS=${LOADED_PLUGINS}" "${FILECONF}"
+fi
+
 echo "[INSTALL] Setup NGINX"
 echo "Setting webserver to address ($LISTEN_ADDR) and port ($PORT)"
 envsubst '$INSTALL_DIR $LISTEN_ADDR $PORT' < "${INSTALL_DIR}/install/netalertx.template.conf" > "${NGINX_CONFIG_FILE}"
diff --git a/server/initialise.py b/server/initialise.py
index 10749091..381d125b 100755
--- a/server/initialise.py
+++ b/server/initialise.py
@@ -312,8 +312,7 @@ def importConfigs (db, all_plugins):
     
     # -----------------
     # HANDLE APP_CONF_OVERRIDE via app_conf_override.json
-    
-    # Assuming fullConfFolder is defined elsewhere
+
     app_conf_override_path = fullConfFolder + '/app_conf_override.json'
 
     if os.path.exists(app_conf_override_path):