mirror of
https://github.com/eworm-de/routeros-scripts.git
synced 2026-03-06 14:09:35 +00:00
Compare commits
6 commits
1d664abd1f
...
fb3534c63f
| Author | SHA1 | Date | |
|---|---|---|---|
|
fb3534c63f | ||
|
|
78a4efcc83 | ||
|
|
14b51d96b0 | ||
|
|
2c715096b9 | ||
|
|
2773fef9d8 | ||
|
|
6b0c9ab17d |
8 changed files with 43 additions and 17 deletions
|
|
@ -4,7 +4,7 @@ Initial commands
|
|||
[](https://github.com/eworm-de/routeros-scripts/stargazers)
|
||||
[](https://github.com/eworm-de/routeros-scripts/network)
|
||||
[](https://github.com/eworm-de/routeros-scripts/watchers)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://t.me/routeros_scripts)
|
||||
[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
|
||||
|
||||
|
|
@ -22,8 +22,8 @@ Run the complete base installation:
|
|||
:local CertFileName "ISRG-Root-X2.pem";
|
||||
:local CertFingerprint "69729b8e15a86efc177a57afb7171dfc64add28c2fca8cf1507e34453ccb1470";
|
||||
|
||||
:if (!(([ /certificate/settings/get ]->"builtin-trust-anchors") = "trusted" && \
|
||||
[[ :parse (":return [ :len [ /certificate/builtin/find where common-name=\"" . $CertCommonName . "\" ] ]") ]] > 0)) do={
|
||||
:if (!([ /certificate/settings/get builtin-trust-anchors ] = "trusted" && \
|
||||
[ :len [ /certificate/builtin/find where common-name=$CertCommonName ] ] > 0)) do={
|
||||
:put "Importing certificate...";
|
||||
/tool/fetch ($BaseUrl . "certs/" . $CertFileName) dst-path=$CertFileName as-value;
|
||||
:delay 1s;
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -11,8 +11,8 @@ HTML = $(MARKDOWN:.md=.html)
|
|||
|
||||
all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json
|
||||
|
||||
%.html: %.md Makefile
|
||||
markdown $< | sed 's/href="\([-_\./[:alnum:]]*\)\.md"/href="\1.html"/g' > $@
|
||||
%.html: %.md contrib/html.sh contrib/html.sh.d/head.html
|
||||
contrib/html.sh $< > $@
|
||||
|
||||
%.capsman.rsc: %.template.rsc Makefile
|
||||
sed -e '/\/interface\/wifi\//d' -e '/\/interface\/wireless\//d' -e 's|%TEMPL%|.capsman|' \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ RouterOS Scripts
|
|||
[](https://github.com/eworm-de/routeros-scripts/stargazers)
|
||||
[](https://github.com/eworm-de/routeros-scripts/network)
|
||||
[](https://github.com/eworm-de/routeros-scripts/watchers)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://t.me/routeros_scripts)
|
||||
[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
|
||||
|
||||
|
|
|
|||
9
contrib/html.sh
Executable file
9
contrib/html.sh
Executable file
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
sed "s|__TITLE__|$(head -n1 "${1}")|" < "${0}.d/head.html"
|
||||
markdown -f toc,idanchor "${1}" | sed \
|
||||
-e 's/href="\([-_\./[:alnum:]]*\)\.md"/href="\1.html"/g' \
|
||||
-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|'
|
||||
printf '</body></html>'
|
||||
15
contrib/html.sh.d/head.html
Normal file
15
contrib/html.sh.d/head.html
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<!DOCTYPE html><html lang="en">
|
||||
<head><title>RouterOS Scripts :: __TITLE__</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<style>
|
||||
body { font-family: sans-serif; }
|
||||
h2 { border-bottom: 1px solid #ccc; color: #000; }
|
||||
a { text-decoration: none; }
|
||||
a:hover { text-decoration: underline; }
|
||||
blockquote { border-left: 4px solid #ccc; padding: 0 10px; color: #777; }
|
||||
code { margin: 0 2px; padding: 2px 5px; border: 1px solid #ccc; background-color: #f8f8f8; border-radius: 3px; }
|
||||
pre { background-color: #f8f8f8; border: 1px solid #ccc; overflow: auto; padding: 6px 10px; border-radius: 3px; }
|
||||
pre code { margin: 0; padding: 0; border: 0; }
|
||||
</style>
|
||||
<link rel="icon" href="/logo.png" type="image/png">
|
||||
</head><body>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
# Michael Gisbers <michael@gisbers.de>
|
||||
# https://rsc.eworm.de/COPYING.md
|
||||
#
|
||||
# requires RouterOS, version=7.15
|
||||
# requires RouterOS, version=7.19
|
||||
# requires device-mode, fetch, scheduler
|
||||
#
|
||||
# global functions
|
||||
|
|
@ -121,8 +121,8 @@
|
|||
:return false;
|
||||
}
|
||||
|
||||
:if (([ /certificate/settings/get ]->"builtin-trust-anchors") = "trusted" && \
|
||||
[[ :parse (":return [ :len [ /certificate/builtin/find where common-name=\"" . $CommonName . "\" ] ]") ]] > 0) do={
|
||||
:if ([ /certificate/settings/get builtin-trust-anchors ] = "trusted" && \
|
||||
[ :len [ /certificate/builtin/find where common-name=$CommonName ] ] > 0) do={
|
||||
:return true;
|
||||
}
|
||||
|
||||
|
|
@ -1787,14 +1787,11 @@
|
|||
:local Delay ([ $MAX [ $EitherOr $WaitTime 2s ] 100ms ] / 9);
|
||||
|
||||
:do {
|
||||
:retry {
|
||||
:if ([ :len [ /file/find where name=$FileName ] ] = 0) do={
|
||||
:error false;
|
||||
}
|
||||
:retry {
|
||||
/file/get $FileName;
|
||||
:return true;
|
||||
} delay=$Delay max=10;
|
||||
} on-error={
|
||||
:return false;
|
||||
}
|
||||
} on-error={ }
|
||||
|
||||
:while ([ :len [ /file/find where name=$FileName ] ] > 0) do={
|
||||
:do {
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
:return false;
|
||||
}
|
||||
|
||||
:if ([ $FileExists $FileName ] = true) do={
|
||||
:if ([ $FileExists $FileName ] = false) do={
|
||||
$LogPrint warning $0 ("File '" . $FileName . "' does not exist.");
|
||||
:return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,11 @@
|
|||
/system/reboot;
|
||||
}
|
||||
|
||||
:if ([ /system/scheduler/find where name="_RebootForUpdate" ] > 0) do={
|
||||
$LogPrint warning $ScriptName ("Scheduler for reboot already exists.");
|
||||
:return false;
|
||||
}
|
||||
|
||||
:local Interval [ $IfThenElse ([ :totime $PackagesUpdateDeferReboot ] >= 1d) \
|
||||
$PackagesUpdateDeferReboot 1d ];
|
||||
:local StartTime [ :tostr [ :totime (10800 + [ $GetRandomNumber 7200 ]) ] ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue