vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENV init settings fix
Some checks are pending
docker / docker_dev (push) Waiting to run
Details

Browse Source
This commit is contained in:
jokob-sk
2024-10-19 15:57:40 +11:00
parent 7d0b583571
commit d09bbbe73e
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dockerfiles/setup.sh
View File

@@ -43,6 +43,10 @@ fi
# OVERRIDE settings: Handling APP_CONF_OVERRIDE # OVERRIDE settings: Handling APP_CONF_OVERRIDE
# Check if APP_CONF_OVERRIDE is set # Check if APP_CONF_OVERRIDE is set
# remove old
rm "${INSTALL_DIR}/config/app_conf_override.json"
if [ -z "$APP_CONF_OVERRIDE" ]; then if [ -z "$APP_CONF_OVERRIDE" ]; then
echo "APP_CONF_OVERRIDE is not set. Skipping config file creation." echo "APP_CONF_OVERRIDE is not set. Skipping config file creation."
else else

2
front/settings.php
View File

@@ -471,6 +471,8 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX
// Parse the setType JSON string into an object // Parse the setType JSON string into an object
let inputHtml = ''; let inputHtml = '';
console.log(setType);
const setTypeObject = JSON.parse(setType.replace(/'/g, '"')); const setTypeObject = JSON.parse(setType.replace(/'/g, '"'));
const dataType = setTypeObject.dataType; const dataType = setTypeObject.dataType;

19
server/initialise.py
View File

@@ -48,6 +48,7 @@ def ccd(key, default, config_dir, name, inputtype, options, group, events=None,
# Single quotes might break SQL queries, replacing them # Single quotes might break SQL queries, replacing them
if inputtype == 'text': if inputtype == 'text':
result = result.replace('\'', "{s-quote}") result = result.replace('\'', "{s-quote}")
# Create the tuples # Create the tuples
sql_safe_tuple = (key, name, desc, str(inputtype), options, regex, str(result), group, str(events), overriddenByEnv) sql_safe_tuple = (key, name, desc, str(inputtype), options, regex, str(result), group, str(events), overriddenByEnv)
@@ -310,17 +311,15 @@ def importConfigs (db, all_plugins):
# Loop through settings_override dictionary # Loop through settings_override dictionary
for setting_name, value in settings_override.items(): for setting_name, value in settings_override.items():
# Ensure the value is treated as a string and passed directly # Ensure the value is treated as a string and passed directly
if isinstance(value, str): if isinstance(value, str) == False:
# Log the value being passed value = str(value)
# ccd(key, default, config_dir, name, inputtype, options, group, events=None, desc="", regex="", setJsonMetadata=None, overrideTemplate=None, forceDefault=False)
mylog('debug', [f"[Config] Setting override {setting_name} with value: {value}"]) # Log the value being passed
ccd(setting_name, value, c_d, '_KEEP_', '_KEEP_', '_KEEP_', '_KEEP_', None, "_KEEP_", "", None, None, True, 1) # ccd(key, default, config_dir, name, inputtype, options, group, events=None, desc="", regex="", setJsonMetadata=None, overrideTemplate=None, forceDefault=False)
else: mylog('debug', [f"[Config] Setting override {setting_name} with value: {value}"])
# Convert to string and log ccd(setting_name, value, c_d, '_KEEP_', '_KEEP_', '_KEEP_', '_KEEP_', None, "_KEEP_", "", None, None, True, 1)
# ccd(key, default, config_dir, name, inputtype, options, group, events=None, desc="", regex="", setJsonMetadata=None, overrideTemplate=None, forceDefault=False)
mylog('debug', [f"[Config] Setting override {setting_name} with value: {str(value)}"])
ccd(setting_name, str(value), c_d, '_KEEP_', '_KEEP_', '_KEEP_', '_KEEP_', None, "_KEEP_", "", None, None, True, 1)
except json.JSONDecodeError: except json.JSONDecodeError:
mylog('none', [f"[Config] [ERROR] Setting override decoding JSON from {app_conf_override_path}"]) mylog('none', [f"[Config] [ERROR] Setting override decoding JSON from {app_conf_override_path}"])