Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

shorten modules directory name (global-functions.d -> mod)

Browse source
This commit is contained in:
Christian Hesse 2021-11-15 20:22:56 +01:00
parent f484e45b6a
commit 8fc88c73f8
14 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -203,8 +203,8 @@ Available Scripts
Available modules Available modules
----------------- -----------------
* [Manage ports in bridge](doc/global-functions.d/bridge-port-to.md) * [Manage ports in bridge](doc/mod/bridge-port-to.md)
* [Manage VLANs on bridge ports](doc/global-functions.d/bridge-port-vlan.md) * [Manage VLANs on bridge ports](doc/mod/bridge-port-vlan.md)
Contact Contact
------- -------

2
doc/global-functions.d/bridge-port-to.md → doc/mod/bridge-port-to.md
View file

@ -17,7 +17,7 @@ Requirements and installation
Just install the module: Just install the module:
$ScriptInstallUpdate global-functions.d/bridge-port-to; $ScriptInstallUpdate mod/bridge-port-to;
Configuration Configuration
------------- -------------

2
doc/global-functions.d/bridge-port-vlan.md → doc/mod/bridge-port-vlan.md
View file

@ -16,7 +16,7 @@ Requirements and installation
Just install the module: Just install the module:
$ScriptInstallUpdate global-functions.d/bridge-port-vlan; $ScriptInstallUpdate mod/bridge-port-vlan;
Configuration Configuration
------------- -------------

8
global-config
View file

@ -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 66; :global GlobalConfigVersion 67;
# This is used for DNS and backup file. # This is used for DNS and backup file.
:global Domain "example.com"; :global Domain "example.com";
@ -26,7 +26,7 @@
# You can send Telegram notifications. Register a bot # You can send Telegram notifications. Register a bot
# and add the token and chat ids here, then install the module: # and add the token and chat ids here, then install the module:
# $ScriptInstallUpdate global-functions.d/notification-telegram # $ScriptInstallUpdate mod/notification-telegram
:global TelegramTokenId ""; :global TelegramTokenId "";
:global TelegramChatId ""; :global TelegramChatId "";
#:global TelegramTokenId "123456:ABCDEF-GHI"; #:global TelegramTokenId "123456:ABCDEF-GHI";
@ -36,7 +36,7 @@
# You can send Matrix notifications. Configure these settings and # You can send Matrix notifications. Configure these settings and
# install the module: # install the module:
# $ScriptInstallUpdate global-functions.d/notification-matrix # $ScriptInstallUpdate mod/notification-matrix
:global MatrixHomeServer ""; :global MatrixHomeServer "";
:global MatrixAccessToken ""; :global MatrixAccessToken "";
:global MatrixRoom ""; :global MatrixRoom "";
@ -166,7 +166,7 @@
# Use this for defaults with $ScriptRunOnce # Use this for defaults with $ScriptRunOnce
# Install module with: # Install module with:
# $ScriptInstallUpdate global-functions.d/scriptrunonce # $ScriptInstallUpdate mod/scriptrunonce
:global ScriptRunOnceBaseUrl ""; :global ScriptRunOnceBaseUrl "";
:global ScriptRunOnceUrlSuffix ""; :global ScriptRunOnceUrlSuffix "";

2
global-config-overlay
View file

@ -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 66; :global GlobalConfigVersion 67;
# Copy configuration from global-config here and modify it. # Copy configuration from global-config here and modify it.

6
global-config.changes
View file

@ -70,6 +70,7 @@
64="Implemented '\$InspectVar' in module to inspect variables."; 64="Implemented '\$InspectVar' in module to inspect variables.";
65="Added module to manage VLANs on bridge ports."; 65="Added module to manage VLANs on bridge ports.";
66="Moved script 'bridge-port-to-default' to new module."; 66="Moved script 'bridge-port-to-default' to new module.";
67="Moved modules to directory with shorter name.";
}; };
# Migration steps to be applied on script updates # Migration steps to be applied on script updates
@ -77,7 +78,8 @@
41=":global SendNotification; \$SendNotification (\"Migration mechanism\") (\"Congratulations!\nSuccessfully tested the new migration mechanism.\");"; 41=":global SendNotification; \$SendNotification (\"Migration mechanism\") (\"Congratulations!\nSuccessfully tested the new migration mechanism.\");";
47="/ certificate remove [ find where fingerprint=\"731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568\" or fingerprint=\"25847d668eb4f04fdd40b12b6b0740c567da7d024308eb6c2c96fe41d9de218d\" ];"; 47="/ certificate remove [ find where fingerprint=\"731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568\" or fingerprint=\"25847d668eb4f04fdd40b12b6b0740c567da7d024308eb6c2c96fe41d9de218d\" ];";
52=":global CertificateDownload; :if ([ :len [ / certificate find where fingerprint=\"67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd\" or fingerprint=\"96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6\" ] ] < 2) do={ \$CertificateDownload \"R3\"; }; / certificate remove [ find where fingerprint=\"0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739\" ];"; 52=":global CertificateDownload; :if ([ :len [ / certificate find where fingerprint=\"67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd\" or fingerprint=\"96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6\" ] ] < 2) do={ \$CertificateDownload \"R3\"; }; / certificate remove [ find where fingerprint=\"0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739\" ];";
54=":global ScriptInstallUpdate; :global TelegramTokenId; :global TelegramChatId; :if ([ :len \$TelegramTokenId ] > 0 && [ :len \$TelegramChatId ] > 0) do={ \$ScriptInstallUpdate global-functions.d/notification-telegram; }"; 54=":global ScriptInstallUpdate; :global TelegramTokenId; :global TelegramChatId; :if ([ :len \$TelegramTokenId ] > 0 && [ :len \$TelegramChatId ] > 0) do={ \$ScriptInstallUpdate mod/notification-telegram; }";
61="/ system script remove [ find where name~\"^(early-errors|global-wait|mode-button-(event|scheduler)|script-updates)\\\$\" source~\"^#!rsc by RouterOS\\n\" ];"; 61="/ system script remove [ find where name~\"^(early-errors|global-wait|mode-button-(event|scheduler)|script-updates)\\\$\" source~\"^#!rsc by RouterOS\\n\" ];";
66=":global ScriptInstallUpdate; :if ([ :len [ / system script find where name=\"bridge-port-to-default\" ] ] > 0) do={ / system script remove [ find where name~\"^bridge-port-to(-default|ggle)\\\$\" ]; \$ScriptInstallUpdate global-functions.d/bridge-port-to; }"; 66=":global ScriptInstallUpdate; :if ([ :len [ / system script find where name=\"bridge-port-to-default\" ] ] > 0) do={ / system script remove [ find where name~\"^bridge-port-to(-default|ggle)\\\$\" ]; \$ScriptInstallUpdate mod/bridge-port-to; }";
67=":global ScriptInstallUpdate; :global CharacterReplace; :foreach Script in=[ / system script find where name~\"^global-functions.d/\" ] do={ / system script set name=[ \$CharacterReplace [ / system script get \$Script name ] \"global-functions.d/\" \"mod/\" ] \$Script; }; \$ScriptInstallUpdate;";
}; };

6
global-functions
View file

@ -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 66; :global ExpectedConfigVersion 67;
# global variables not to be changed by user # global variables not to be changed by user
:global GlobalFunctionsReady false; :global GlobalFunctionsReady false;
@ -755,7 +755,7 @@
:if ($ScriptVal->"name" = "global-config") do={ :if ($ScriptVal->"name" = "global-config") do={
:set ReloadGlobalConfig true; :set ReloadGlobalConfig true;
} }
:if ($ScriptVal->"name" ~ ("^global-functions(\$|\\.d/.)")) do={ :if ($ScriptVal->"name" = "global-functions" || $ScriptVal->"name" ~ ("^mod/.")) do={
:set ReloadGlobalFunctions true; :set ReloadGlobalFunctions true;
} }
} else={ } else={
@ -1242,7 +1242,7 @@
} }
# load modules # load modules
:foreach Script in=[ / system script find where name ~ "^global-functions\\.d/." ] do={ :foreach Script in=[ / system script find where name ~ "^mod/." ] do={
/ system script run $Script; / system script run $Script;
} }

4
global-functions.d/bridge-port-to → mod/bridge-port-to
View file

@ -1,10 +1,10 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/bridge-port-to # RouterOS script: mod/bridge-port-to
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2013-2021 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
# #
# reset bridge ports to default bridge # reset bridge ports to default bridge
# https://git.eworm.de/cgit/routeros-scripts/about/doc/global-functions.d/bridge-port-to.md # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/bridge-port-to.md
:global BridgePortTo; :global BridgePortTo;

4
global-functions.d/bridge-port-vlan → mod/bridge-port-vlan
View file

@ -1,10 +1,10 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/bridge-port-vlan # RouterOS script: mod/bridge-port-vlan
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2013-2021 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
# #
# manage VLANs on bridge ports # manage VLANs on bridge ports
# https://git.eworm.de/cgit/routeros-scripts/about/doc/global-functions.d/bridge-port-vlan.md # https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/bridge-port-vlan.md
:global BridgePortVlan; :global BridgePortVlan;

2
global-functions.d/inspectvar → mod/inspectvar
View file

@ -1,5 +1,5 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/inspectvar # RouterOS script: mod/inspectvar
# Copyright (c) 2020-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2020-2021 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

2
global-functions.d/ipcalc → mod/ipcalc
View file

@ -1,5 +1,5 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/ipcalc # RouterOS script: mod/ipcalc
# Copyright (c) 2020-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2020-2021 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

2
global-functions.d/notification-matrix → mod/notification-matrix
View file

@ -1,5 +1,5 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/notification-matrix # RouterOS script: mod/notification-matrix
# Copyright (c) 2013-2021 Michael Gisbers <michael@gisbers.de> # Copyright (c) 2013-2021 Michael Gisbers <michael@gisbers.de>
# Christian Hesse <mail@eworm.de> # 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

2
global-functions.d/notification-telegram → mod/notification-telegram
View file

@ -1,5 +1,5 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/notification-telegram # RouterOS script: mod/notification-telegram
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2013-2021 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

2
global-functions.d/scriptrunonce → mod/scriptrunonce
View file

@ -1,5 +1,5 @@
#!rsc by RouterOS #!rsc by RouterOS
# RouterOS script: global-functions.d/scriptrunonece # RouterOS script: mod/scriptrunonece
# Copyright (c) 2020-2021 Christian Hesse <mail@eworm.de> # Copyright (c) 2020-2021 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