mirror of
https://github.com/eworm-de/routeros-scripts
synced 2024-05-14 08:04:19 +00:00
global: notify about merging 'routeros-v7' into 'main'
This commit is contained in:
parent
25704812b2
commit
5135a41332
4 changed files with 10 additions and 4 deletions
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
# Make sure all configuration properties are up to date and this
|
# Make sure all configuration properties are up to date and this
|
||||||
# value is in sync with value in script 'global-functions'!
|
# value is in sync with value in script 'global-functions'!
|
||||||
:global GlobalConfigVersion 74;
|
:global GlobalConfigVersion 75;
|
||||||
|
|
||||||
# This is used for DNS and backup file.
|
# This is used for DNS and backup file.
|
||||||
:global Domain "example.com";
|
:global Domain "example.com";
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# Make sure all configuration properties are up to date and this
|
# Make sure all configuration properties are up to date and this
|
||||||
# value is in sync with value in script 'global-functions'!
|
# value is in sync with value in script 'global-functions'!
|
||||||
# Comment or remove to disable news and change notifications.
|
# Comment or remove to disable news and change notifications.
|
||||||
:global GlobalConfigVersion 74;
|
:global GlobalConfigVersion 75;
|
||||||
|
|
||||||
# Copy configuration from global-config here and modify it.
|
# Copy configuration from global-config here and modify it.
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
# Copyright (c) 2019-2022 Christian Hesse <mail@eworm.de>
|
# Copyright (c) 2019-2022 Christian Hesse <mail@eworm.de>
|
||||||
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
|
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
|
||||||
|
|
||||||
|
:global IfThenElse;
|
||||||
|
:global RequiredRouterOS;
|
||||||
|
|
||||||
# Changes for global-config to be added to notification on script updates
|
# Changes for global-config to be added to notification on script updates
|
||||||
:global GlobalConfigChanges {
|
:global GlobalConfigChanges {
|
||||||
1="Moved variables from 'global-config' to 'global-functions' for independence";
|
1="Moved variables from 'global-config' to 'global-functions' for independence";
|
||||||
|
@ -73,11 +76,14 @@
|
||||||
67="Moved modules to directory with shorter name.";
|
67="Moved modules to directory with shorter name.";
|
||||||
68="Reintroduced 'global-wait' for functions in scheduler.";
|
68="Reintroduced 'global-wait' for functions in scheduler.";
|
||||||
69="Support hard lower limit for voltage in 'check-health'.";
|
69="Support hard lower limit for voltage in 'check-health'.";
|
||||||
70="MikroTik started pushing RouterOS v7. Changes are required if you run it, see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v7";
|
70="MikroTik started pushing RouterOS v7. Changes are no longer required.";
|
||||||
71="MikroTik is pushing RouterOS v7 even more, in parallel branches. If you want to keep RouterOS v6 for some time see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v6";
|
71="MikroTik is pushing RouterOS v7 even more, in parallel branches. If you want to keep RouterOS v6 for some time see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v6";
|
||||||
72="Introduced new script 'netwatch-dns' to manage DNS and DoH servers from netwatch.";
|
72="Introduced new script 'netwatch-dns' to manage DNS and DoH servers from netwatch.";
|
||||||
73="Renamed backup scripts ('cloud-backup' -> 'backup-cloud', 'email-backup' -> 'backup-email', 'upload-backup' -> 'backup-upload').";
|
73="Renamed backup scripts ('cloud-backup' -> 'backup-cloud', 'email-backup' -> 'backup-email', 'upload-backup' -> 'backup-upload').";
|
||||||
74="Extended 'hotspot-to-wpa', it can now read additional configuration from templates and hotspot users.";
|
74="Extended 'hotspot-to-wpa', it can now read additional configuration from templates and hotspot users.";
|
||||||
|
75=("Finally merged the RouterOS v7 code into the main branch. " . [ $IfThenElse ([ $RequiredRouterOS "global-config.changes" "7.0" false ] = true) \
|
||||||
|
("You may now drop '\$ScriptUpdatesUrlSuffix' from 'global-config-overlay'.") \
|
||||||
|
("Still running RouterOS v6, so last reminder to see https://git.eworm.de/cgit/routeros-scripts/about/#changes-for-routeros-v6") ]);
|
||||||
};
|
};
|
||||||
|
|
||||||
# Migration steps to be applied on script updates
|
# Migration steps to be applied on script updates
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# https://git.eworm.de/cgit/routeros-scripts/about/
|
# https://git.eworm.de/cgit/routeros-scripts/about/
|
||||||
|
|
||||||
# expected configuration version
|
# expected configuration version
|
||||||
:global ExpectedConfigVersion 74;
|
:global ExpectedConfigVersion 75;
|
||||||
|
|
||||||
# global variables not to be changed by user
|
# global variables not to be changed by user
|
||||||
:global GlobalFunctionsReady false;
|
:global GlobalFunctionsReady false;
|
||||||
|
|
Loading…
Reference in a new issue