From 1089b7e7f9a6638c7783538f464916d16b3a6e87 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 14 Jan 2022 07:46:43 +0100 Subject: README: install correct global-config-overlay for RouterOS v6 --- INITIAL-COMMANDS.md | 9 ++++++++- README.d/04-import-scripts.avif | Bin 3810 -> 4599 bytes README.md | 9 +++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/INITIAL-COMMANDS.md b/INITIAL-COMMANDS.md index 843a3a0..9a8a129 100644 --- a/INITIAL-COMMANDS.md +++ b/INITIAL-COMMANDS.md @@ -6,7 +6,14 @@ Initial commands These command are inteneded for initial setup. If you are not aware of the procedure please follow [the long way in detail](README.md#the-long-way-in-detail). +One extra step is required if you run RouterOS v6: + + :global ScriptUpdatesUrlSuffix "\?h=routeros-v6"; + +Then run the complete base installation: + { + :global ScriptUpdatesUrlSuffix; / tool fetch "https://git.eworm.de/cgit/routeros-scripts/plain/certs/R3.pem" dst-path="letsencrypt-R3.pem" as-value; :delay 1s; / certificate import file-name=letsencrypt-R3.pem passphrase=""; @@ -15,7 +22,7 @@ procedure please follow [the long way in detail](README.md#the-long-way-in-detai }; / file remove "letsencrypt-R3.pem"; :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 add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script . $ScriptUpdatesUrlSuffix) output=user as-value]->"data"); }; / 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-functions; }"; diff --git a/README.d/04-import-scripts.avif b/README.d/04-import-scripts.avif index c6a2a3c..c86a5c8 100644 Binary files a/README.d/04-import-scripts.avif and b/README.d/04-import-scripts.avif differ diff --git a/README.md b/README.md index d65ea0a..990aef9 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,14 @@ All following commands will verify the server certificate. For validity the certificate's lifetime is checked with local time, so make sure the device's date and time is set correctly! +One extra step is required if you run RouterOS v6: + + :global ScriptUpdatesUrlSuffix "\?h=routeros-v6"; + Now let's download the main scripts and add them in configuration on the fly. - :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"); }; + :global ScriptUpdatesUrlSuffix; + :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 . $ScriptUpdatesUrlSuffix) output=user as-value]->"data"); }; ![screenshot: import scripts](README.d/04-import-scripts.avif) @@ -116,7 +121,7 @@ to be updated automatically! RouterOS v6 will become deprecated at some time in the future, but to date it is still the default for these scripts (in branch `main`). This will change however, so if you want to stay with RouterOS v6 for some time add -these lines to your `global-config-overlay`: +these lines to your `global-config-overlay`, if missing: # Use branch routeros-v6 with RouterOS v6: :global ScriptUpdatesUrlSuffix "\?h=routeros-v6"; -- cgit v1.2.3-54-g00ecf