mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-31 16:24:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-config: load overlay automatically

Browse source
This commit is contained in:
Christian Hesse 2021-12-07 15:40:14 +01:00
parent 8f8130775f
commit 1f5cc39b3c
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
README.d/06-run-and-schedule-scripts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

4
README.md
View file

@ -99,8 +99,8 @@ Save changes and exit with `Ctrl-o`.
And finally load configuration and functions and add the scheduler. And finally load configuration and functions and add the scheduler.
/ 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-config-overlay; run global-functions; }"; / system scheduler add name="global-scripts" start-time=startup on-event="/ system script { run global-config; run global-functions; }";
![screenshot: run and schedule scripts](README.d/06-run-and-schedule-scripts.png) ![screenshot: run and schedule scripts](README.d/06-run-and-schedule-scripts.png)

8
global-config
View file

@ -193,3 +193,11 @@
"cert1-cn"="v3ry-s3cr3t"; "cert1-cn"="v3ry-s3cr3t";
"cert2-cn"="4n0th3r-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!");
}

8
global-functions
View file

@ -777,11 +777,11 @@
} }
:if ($ReloadGlobalConfig = true) do={ :if ($ReloadGlobalConfig = true) do={
$LogPrintExit2 info $0 ("Reloading global configuration and overlay.") false; $LogPrintExit2 info $0 ("Reloading global configuration.") false;
:do { :do {
/ system script { run global-config; run global-config-overlay; } / system script run global-config;
} on-error={ } on-error={
$LogPrintExit2 error $0 ("Reloading global configuration and overlay failed!" . \ $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
" Syntax error or missing overlay\?") false; " Syntax error or missing overlay\?") false;
} }
} }
@ -838,7 +838,7 @@
:local NotificationMessage ("Current configuration on " . $Identity . \ :local NotificationMessage ("Current configuration on " . $Identity . \
" is out of date. Please update global-config-overlay, then increase " . \ " is out of date. Please update global-config-overlay, then increase " . \
"\$GlobalConfigVersion (currently " . $GlobalConfigVersion . \ "\$GlobalConfigVersion (currently " . $GlobalConfigVersion . \
") to " . $ExpectedConfigVersion . " and re-run global-config-overlay."); ") to " . $ExpectedConfigVersion . " and re-run global-config.");
$LogPrintExit2 info $0 ($NotificationMessage) false; $LogPrintExit2 info $0 ($NotificationMessage) false;
:if ([ :len $GlobalConfigChanges ] > 0) do={ :if ([ :len $GlobalConfigChanges ] > 0) do={