aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2021-12-07 11:04:50 +0100
committerGravatar Christian Hesse <mail@eworm.de>2021-12-07 11:11:19 +0100
commitdab04fd63e61618a8ef4996e3322d60f37f1d911 (patch)
tree5f159120742caf036d0e5257fd239ebecf68782e
parent95062a3dbc63ea07bf24c112e33c83073c56c4cb (diff)
README: changes for RouterOS v7change-70
-rw-r--r--README.md14
-rw-r--r--global-config7
-rw-r--r--global-config-overlay2
-rw-r--r--global-config.changes1
-rw-r--r--global-functions2
5 files changed, 22 insertions, 4 deletions
diff --git a/README.md b/README.md
index 3590ea1..f98cf6b 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,20 @@ to be updated automatically!
![screenshot: schedule update](README.d/07-schedule-update.png)
+### Changes for RouterOS v7
+
+RouterOS v7 is developed in paralled to RouterOS v6. The former brings some
+shiny new features, the latter provides proven stability.
+
+The changes require incompatible changes to scripts, so these changes go to
+a separate branch. If you decide to run RouterOS v7 please switch to branch
+`routeros-v7` by adding these lines to your `global-config-overlay`:
+
+ # Use branch routeros-v7 with RouterOS v7:
+ :global ScriptUpdatesUrlSuffix "\?h=routeros-v7";
+
+Then reload the configuration and continue below to update scripts.
+
Updating scripts
----------------
diff --git a/global-config b/global-config
index 26e1a76..e03b5eb 100644
--- a/global-config
+++ b/global-config
@@ -8,7 +8,7 @@
# Make sure all configuration properties are up to date and this
# value is in sync with value in script 'global-functions'!
-:global GlobalConfigVersion 69;
+:global GlobalConfigVersion 70;
# This is used for DNS and backup file.
:global Domain "example.com";
@@ -159,11 +159,14 @@
# alternative urls - main: stable code - next: currently in development
#:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/main/";
#:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/next/";
+#:global ScriptUpdatesBaseUrl "https://raw.githubusercontent.com/eworm-de/routeros-scripts/routeros-v7/";
#:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/main/";
#:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/next/";
+#:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/routeros-v7/";
:global ScriptUpdatesUrlSuffix "";
-# use next branch with default url (git.eworm.de)
+# use next or routeros-v7 branch with default url (git.eworm.de)
#:global ScriptUpdatesUrlSuffix "\?h=next";
+#:global ScriptUpdatesUrlSuffix "\?h=routeros-v7";
# Use this for defaults with $ScriptRunOnce
# Install module with:
diff --git a/global-config-overlay b/global-config-overlay
index 87abb87..fe3bfee 100644
--- a/global-config-overlay
+++ b/global-config-overlay
@@ -8,7 +8,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 news and change notifications.
-:global GlobalConfigVersion 69;
+:global GlobalConfigVersion 70;
# Copy configuration from global-config here and modify it.
diff --git a/global-config.changes b/global-config.changes
index a8198db..102bc41 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -73,6 +73,7 @@
67="Moved modules to directory with shorter name.";
68="Reintroduced 'global-wait' for functions in scheduler.";
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";
};
# Migration steps to be applied on script updates
diff --git a/global-functions b/global-functions
index 4ec903a..ba6419d 100644
--- a/global-functions
+++ b/global-functions
@@ -8,7 +8,7 @@
# https://git.eworm.de/cgit/routeros-scripts/about/
# expected configuration version
-:global ExpectedConfigVersion 69;
+:global ExpectedConfigVersion 70;
# global variables not to be changed by user
:global GlobalFunctionsReady false;