diff options
| author |  Christian Hesse <mail@eworm.de> | 2021-12-07 15:40:14 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2021-12-07 21:58:03 +0100 |
| commit | 1f5cc39b3cb388e69e479d8b2b1a774c2abde37d (patch) | |
| tree | b08a4ea23ea38c126c2e757c66ce7fcea4c7a117 | |
| parent | 8f8130775f9dc2590e3408621c8a5ceb80b76d76 (diff) | |
global-config: load overlay automatically
| -rw-r--r-- | README.d/06-run-and-schedule-scripts.png | bin | 5416 -> 4526 bytes | |||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | global-config | 8 | ||||
| -rw-r--r-- | global-functions | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/README.d/06-run-and-schedule-scripts.png b/README.d/06-run-and-schedule-scripts.png Binary files differindex bd8aa9f..23b4d7b 100644 --- a/README.d/06-run-and-schedule-scripts.png +++ b/README.d/06-run-and-schedule-scripts.png @@ -99,8 +99,8 @@ Save changes and exit with `Ctrl-o`. And finally load configuration and functions and add the scheduler. - / system script { run global-config; run global-config-overlay; run global-functions; }; - / system scheduler add name="global-scripts" start-time=startup on-event="/ system script { run global-config; run global-config-overlay; run global-functions; }"; + / system script { run global-config; run global-functions; }; + / system scheduler add name="global-scripts" start-time=startup on-event="/ system script { run global-config; run global-functions; }";  diff --git a/global-config b/global-config index e03b5eb..522155e 100644 --- a/global-config +++ b/global-config @@ -193,3 +193,11 @@ "cert1-cn"="v3ry-s3cr3t"; "cert2-cn"="4n0th3r-s3cr3t"; } + +# load custom settings from overlay +# Warning: Do *NOT* copy this code to overlay! +:do { + / system script run global-config-overlay; +} on-error={ + :log error ("Loading configuration from overlay failed!"); +} diff --git a/global-functions b/global-functions index ba6419d..b313b70 100644 --- a/global-functions +++ b/global-functions @@ -777,11 +777,11 @@ } :if ($ReloadGlobalConfig = true) do={ - $LogPrintExit2 info $0 ("Reloading global configuration and overlay.") false; + $LogPrintExit2 info $0 ("Reloading global configuration.") false; :do { - / system script { run global-config; run global-config-overlay; } + / system script run global-config; } on-error={ - $LogPrintExit2 error $0 ("Reloading global configuration and overlay failed!" . \ + $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \ " Syntax error or missing overlay\?") false; } } @@ -838,7 +838,7 @@ :local NotificationMessage ("Current configuration on " . $Identity . \ " is out of date. Please update global-config-overlay, then increase " . \ "\$GlobalConfigVersion (currently " . $GlobalConfigVersion . \ - ") to " . $ExpectedConfigVersion . " and re-run global-config-overlay."); + ") to " . $ExpectedConfigVersion . " and re-run global-config."); $LogPrintExit2 info $0 ($NotificationMessage) false; :if ([ :len $GlobalConfigChanges ] > 0) do={ |
