mirror.MikroTik/eworm-de.routeros-scripts_main
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2025-08-20 01:29:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $ScriptInstallUpdate: reload configuration later

Browse source
This commit is contained in:
Christian Hesse 2021-06-02 23:51:11 +02:00
parent 2315d6bc59
commit f9a2afdeda
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
global-functions
View file

@ -710,6 +710,7 @@
:local ExpectedConfigVersionBefore $ExpectedConfigVersion; :local ExpectedConfigVersionBefore $ExpectedConfigVersion;
:local ReloadGlobalFunctions false; :local ReloadGlobalFunctions false;
:local ReloadGlobalConfig false;
:local ScriptInstallUpdateBefore [ :tostr $ScriptInstallUpdate ]; :local ScriptInstallUpdateBefore [ :tostr $ScriptInstallUpdate ];
:foreach Script in=[ / system script find where source~"^#!rsc( by RouterOS)\?\n" ] do={ :foreach Script in=[ / system script find where source~"^#!rsc( by RouterOS)\?\n" ] do={
@ -760,13 +761,7 @@
/ system script set owner=($ScriptVal->"name") source=$SourceNew \ / system script set owner=($ScriptVal->"name") source=$SourceNew \
dont-require-permissions=$DontRequirePermissions $Script; dont-require-permissions=$DontRequirePermissions $Script;
:if ($ScriptVal->"name" = "global-config") do={ :if ($ScriptVal->"name" = "global-config") do={
$LogPrintExit2 info $0 ("Reloading global configuration and overlay.") false; :set ReloadGlobalConfig true;
:do {
/ system script { run global-config; run global-config-overlay; }
} on-error={
$LogPrintExit2 error $0 ("Reloading global configuration and overlay failed!" . \
" Syntax error or missing overlay\?") false;
}
} }
:if ($ScriptVal->"name" ~ "^global-functions(\$|\\.d/.)") do={ :if ($ScriptVal->"name" ~ "^global-functions(\$|\\.d/.)") do={
:set ReloadGlobalFunctions true; :set ReloadGlobalFunctions true;
@ -796,6 +791,16 @@
} }
} }
:if ($ReloadGlobalConfig = true) do={
$LogPrintExit2 info $0 ("Reloading global configuration and overlay.") false;
:do {
/ system script { run global-config; run global-config-overlay; }
} on-error={
$LogPrintExit2 error $0 ("Reloading global configuration and overlay failed!" . \
" Syntax error or missing overlay\?") false;
}
}
:if ($ExpectedConfigVersionBefore != $ExpectedConfigVersion) do={ :if ($ExpectedConfigVersionBefore != $ExpectedConfigVersion) do={
:global GlobalConfigChanges; :global GlobalConfigChanges;
:global GlobalConfigMigration; :global GlobalConfigMigration;