diff --git a/INITIAL-COMMANDS.md b/INITIAL-COMMANDS.md index 787c11e6..6e70b66a 100644 --- a/INITIAL-COMMANDS.md +++ b/INITIAL-COMMANDS.md @@ -17,7 +17,7 @@ Initial commands Run the complete base installation: { - :local BaseUrl "https://rsc.eworm.de/main/"; + :local BaseUrl "https://git.eworm.de/cgit/routeros-scripts/plain/"; :local CertCommonName "ISRG Root X2"; :local CertFileName "ISRG-Root-X2.pem"; :local CertFingerprint "69729b8e15a86efc177a57afb7171dfc64add28c2fca8cf1507e34453ccb1470"; diff --git a/README.md b/README.md index af9ef658..36408ec6 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ If you intend to download the scripts from a different location (for example from github.com) install the corresponding certificate chain. - /tool/fetch "https://rsc.eworm.de/main/certs/ISRG-Root-X2.pem" dst-path="isrg-root-x2.pem"; + /tool/fetch "https://git.eworm.de/cgit/routeros-scripts/plain/certs/ISRG-Root-X2.pem" dst-path="isrg-root-x2.pem"; ![screenshot: download certs](README.d/01-download-certs.avif) @@ -125,7 +125,7 @@ date and time is set correctly! 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 owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl ("https://rsc.eworm.de/main/" . $Script . ".rsc") output=user as-value]->"data"); }; + :foreach Script in={ "global-config"; "global-config-overlay"; "global-functions" } do={ /system/script/add name=$Script owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit/routeros-scripts/plain/" . $Script . ".rsc") output=user as-value]->"data"); }; ![screenshot: import scripts](README.d/04-import-scripts.avif) @@ -404,15 +404,14 @@ immediately remove the link in question. Upstream -------- -[rsc.eworm.de](https://rsc.eworm.de/) - [![upstream](general/qr-code.png)](https://rsc.eworm.de/) -### Code hosting +URL: +[GitHub.com](https://github.com/eworm-de/routeros-scripts#routeros-scripts) -* [eworm.de](https://git.eworm.de/cgit/routeros-scripts/about/) -* [GitHub.com](https://github.com/eworm-de/routeros-scripts#routeros-scripts) -* [GitLab.com](https://gitlab.com/eworm-de/routeros-scripts#routeros-scripts) +Mirror: +[eworm.de](https://git.eworm.de/cgit/routeros-scripts/about/) +[GitLab.com](https://gitlab.com/eworm-de/routeros-scripts#routeros-scripts) --- [⬆️ Go back to top](#top) diff --git a/contrib/Makefile b/contrib/Makefile index 56b87074..aae31786 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -7,6 +7,4 @@ HTML := $(wildcard *.html) all: docs docs: $(HTML) - sed -i -e '/href=/s|\.md|\.html|' \ - -e '/blockquote/s|/\*! display \*/|display: none;|' \ - $(HTML) + sed -i '/href=/s|\.md|\.html|' $(HTML) diff --git a/contrib/html.sh b/contrib/html.sh index da3873e3..6276df1a 100755 --- a/contrib/html.sh +++ b/contrib/html.sh @@ -13,6 +13,5 @@ sed \ markdown -f toc,idanchor "${1}" | sed \ -e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \ -e '/| id="\L\1">|' \ - -e '/' diff --git a/contrib/html.sh.d/head.html b/contrib/html.sh.d/head.html index 0e7c1bdc..1d4f93a3 100644 --- a/contrib/html.sh.d/head.html +++ b/contrib/html.sh.d/head.html @@ -6,12 +6,12 @@ - - + +
eworm on meadowQR code: rsc.eworm.deeworm on meadowQR code: rsc.eworm.de RouterOS Scripts
a collection of scripts for MikroTik RouterOS
-
+
diff --git a/contrib/logo-color.html b/contrib/logo-color.html index c3d1d53e..f824e2d4 100644 --- a/contrib/logo-color.html +++ b/contrib/logo-color.html @@ -5,27 +5,11 @@ - - - - - - - - - -
eworm on meadowQR code: rsc.eworm.deRouterOS Scripts
a collection of scripts for MikroTik RouterOS
-

Logo Color Changer

⬅️ Go back to main README

-

💡️ Hint: This site or links -on it may be broken on code hosting sites. Use -Logo Color Changer -instead.

-

You want the logo for your own notifications? But you joined the Telegram Group and want something that differentiates? Color it!

diff --git a/contrib/notification.html b/contrib/notification.html index b7efdb59..a4d04864 100644 --- a/contrib/notification.html +++ b/contrib/notification.html @@ -5,27 +5,11 @@ - - - - - - - - - -
eworm on meadowQR code: rsc.eworm.deRouterOS Scripts
a collection of scripts for MikroTik RouterOS
-

Notification Generator

⬅️ Go back to main README

-

💡️ Hint: This site or links -on it may be broken on code hosting sites. Use -Notification Generator -instead.

-
diff --git a/doc/mod/notification-telegram.md b/doc/mod/notification-telegram.md index f464ff0f..05180b2a 100644 --- a/doc/mod/notification-telegram.md +++ b/doc/mod/notification-telegram.md @@ -106,13 +106,10 @@ chat with [BotFather ↗️](https://t.me/BotFather) and set it there. ![set profile photo](notification-telegram.d/setuserpic.avif) -Have a look at my [Logo Color Changer](../../contrib/logo-color.html) +Have a look at my +[RouterOS-Scripts Logo Color Changer](../../contrib/logo-color.html) to create a colored version of this scripts' logo. -> 💡️ **Hint**: The above link may be broken on code hosting sites. -> Use [Logo Color Changer](https://rsc.eworm.de/main/contrib/logo-color.html) -> instead. - See also -------- diff --git a/doc/mod/scriptrunonce.md b/doc/mod/scriptrunonce.md index 1fbb697f..955d12ed 100644 --- a/doc/mod/scriptrunonce.md +++ b/doc/mod/scriptrunonce.md @@ -48,7 +48,7 @@ Usage and invocation The function `$ScriptRunOnce` expects an URL (or name if `ScriptRunOnceBaseUrl` is given) pointing to a script as parameter. - $ScriptRunOnce https://rsc.eworm.de/main/doc/mod/scriptrunonce.d/hello-world.rsc; + $ScriptRunOnce https://git.eworm.de/cgit/routeros-scripts/plain/doc/mod/scriptrunonce.d/hello-world.rsc; ![ScriptRunOnce](scriptrunonce.d/scriptrunonce.avif)