From c77ae32736aae80f366888762b6d28f74ea6f4dd Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Wed, 16 Oct 2024 23:12:29 +1100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9A=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/BACKUPS.md | 2 +- front/php/templates/language/it_it.json | 0 front/plugins/unifi_import/README.md | 9 ++++++++- server/initialise.py | 10 ++++++++-- 4 files changed, 17 insertions(+), 4 deletions(-) mode change 100644 => 100755 front/php/templates/language/it_it.json diff --git a/docs/BACKUPS.md b/docs/BACKUPS.md index 67c448bf..a08bcfb6 100755 --- a/docs/BACKUPS.md +++ b/docs/BACKUPS.md @@ -73,7 +73,7 @@ End-result: Partial restore (historical data & configurations from the Maintenan #### Recovery: -Even with a corrupted database you can recover what I would argue is 99% of the configuration (except of a couple of settings under Maintenance). +Even with a corrupted database you can recover what I would argue is 99% of the configuration. - map the `/config/app.conf` file as described in the [Setup documentation](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md#docker-paths). - rename the `devices_.csv` to `devices.csv` and place it in the `/config` folder diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 diff --git a/front/plugins/unifi_import/README.md b/front/plugins/unifi_import/README.md index b64e840c..f224ff23 100755 --- a/front/plugins/unifi_import/README.md +++ b/front/plugins/unifi_import/README.md @@ -12,9 +12,16 @@ Specify the following settings in the Settings section of NetAlertX: - `UNFIMP_sites` - Name of the sites (usually 'default', check the URL in your UniFi controller UI if unsure. The site id is in the following part of the URL: `https://192.168.1.1:8443/manage/site/this-is-the-site-id/settings/`). - `UNFIMP_protocol` - https:// or http:// - `UNFIMP_port` - Usually `8443` or `8843` -- `UNFIMP_version` - e.g. `UDMP-unifiOS` is used for the "Cloud Gateway Ultra" +- `UNFIMP_version` - see below table for details +#### Version table + +| Controller | `UNFIMP_version` | +| ------------------------------------------------------ | ------------------------- | +| Cloud Gateway Ultra / UCK cloudkey V2 plus (v4.0.18) | `UDMP-unifiOS` | +| Docker hosted | `v5` | + ### Notes - It is recommended to create a read-only user in your UniFi controller \ No newline at end of file diff --git a/server/initialise.py b/server/initialise.py index b9ca951a..00e18cf2 100755 --- a/server/initialise.py +++ b/server/initialise.py @@ -295,10 +295,10 @@ def importConfigs (db, all_plugins): mylog('none', ['[Config] Plugins to load: ', loaded_plugins_prefixes]) conf.plugins_once_run = False - # ----------------- - # Plugins END + # ----------------- # HANDLE APP_CONF_OVERRIDE via app_conf_override.json + # Assuming fullConfFolder is defined elsewhere app_conf_override_path = fullConfFolder + '/app_conf_override.json' @@ -327,6 +327,9 @@ def importConfigs (db, all_plugins): else: mylog('debug', [f"[Config] File {app_conf_override_path} does not exist."]) + # ----------------- + # HANDLE APP was upgraded message - clear cache + # Check if app was upgraded with open(applicationPath + '/front/buildtimestamp.txt', 'r') as f: @@ -346,6 +349,9 @@ def importConfigs (db, all_plugins): write_notification(f'[Upgrade] : App upgraded 🚀 Please clear the cache:
  1. Click OK below
  2. Clear the browser cache (shift + browser refresh button)
  3. Clear app cache with the 🔄 (reload) button in the header
  4. Go to Settings and click Save
Check out new features and what has changed in the 📓 release notes.', 'interrupt', timeNowTZ()) + # ----------------- + # Initialization finished, update DB and API endpoints + # Insert settings into the DB sql.execute ("DELETE FROM Settings") # mylog('debug', [f"[Config] conf.mySettingsSQLsafe : '{conf.mySettingsSQLsafe}'"])