global-config-overlay: remove magic

This allows to drop the ignore flag.
This commit is contained in:
Christian Hesse 2021-03-04 00:31:58 +01:00
parent 842c44b10a
commit 9ab20bb927
4 changed files with 3 additions and 9 deletions

View File

@ -17,7 +17,6 @@ procedure please follow [the long way in detail](README.md#the-long-way-in-detai
:foreach Script in={ "global-config"; "global-config-overlay"; "global-functions" } do={
/ system script add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script) output=user as-value]->"data");
}
/ system script set comment="ignore" global-config-overlay;
/ 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; }";
:global CertificateNameByCN;

View File

@ -92,10 +92,6 @@ Now let's download the main scripts and add them in configuration on the fly.
[admin@MikroTik] > :foreach Script in={ "global-config"; "global-config-overlay"; "global-functions" } do={ / system script add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script) output=user as-value]->"data"); }
Mark `global-config-overlay` not to be overwritten by future updates.
[admin@MikroTik] > / system script set comment="ignore" global-config-overlay
The configuration needs to be tweaked for your needs. Edit
`global-config-overlay`, copy configuration from
[`global-config`](global-config) (the one without `-overlay`).

View File

@ -1,5 +1,4 @@
#!rsc by RouterOS
# RouterOS script: global-config-overlay
# Overlay for global configuration by RouterOS Scripts
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
@ -8,7 +7,7 @@
# Make sure all configuration properties are up to date and this
# value is in sync with value in script 'global-functions'!
# Comment or remove to disable change notifications.
# Comment or remove to disable news and change notifications.
:global GlobalConfigVersion 47;
# Copy configuration from global-config here and modify it.

View File

@ -1,4 +1,4 @@
# RouterOS global-config changes
# News, changes and migration by RouterOS Scripts
# Copyright (c) 2019-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md