From 9ab20bb92700339977e3920890500f67d81152dd Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 4 Mar 2021 00:31:58 +0100 Subject: global-config-overlay: remove magic This allows to drop the ignore flag. --- INITIAL-COMMANDS.md | 1 - README.md | 4 ---- global-config-overlay | 5 ++--- global-config.changes | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/INITIAL-COMMANDS.md b/INITIAL-COMMANDS.md index 9a5d6c8..fa32654 100644 --- a/INITIAL-COMMANDS.md +++ b/INITIAL-COMMANDS.md @@ -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; diff --git a/README.md b/README.md index 14b32db..090aab9 100644 --- a/README.md +++ b/README.md @@ -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`). diff --git a/global-config-overlay b/global-config-overlay index 10376c7..850e6d8 100644 --- a/global-config-overlay +++ b/global-config-overlay @@ -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 # 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. diff --git a/global-config.changes b/global-config.changes index 2bc18c0..2dc68f7 100644 --- a/global-config.changes +++ b/global-config.changes @@ -1,4 +1,4 @@ -# RouterOS global-config changes +# News, changes and migration by RouterOS Scripts # Copyright (c) 2019-2021 Christian Hesse # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md -- cgit v1.2.3-70-g09d2