Compare commits

..

63 commits

Author SHA1 Message Date
Christian Hesse
1c11d77bce contrib/html: support click on code block to copy to clipboard 2025-11-17 09:31:36 +01:00
Christian Hesse
c80dd7d891 global-functions: add and fix global scheduler automatically...
... and also adjust README and INITIAL-COMMANDS.
2025-11-15 19:17:46 +01:00
Christian Hesse
1e65df49fb contrib/commitinfo: support updating the commit info 2025-11-15 18:45:35 +01:00
Christian Hesse
576f41fc86 global-functions: $FetchUserAgentStr: add commit info in user agent string 2025-11-13 16:07:28 +01:00
Christian Hesse
a9076f760d Merge branch 'rsc-eworm-de' into next 2025-11-13 16:07:28 +01:00
Christian Hesse
cb82d9b271 Merge branch 'contrib-template' into next 2025-11-13 16:07:28 +01:00
Christian Hesse
0a4b963c26 doc/mod/scriptrunonce: get script from rsc.eworm.de 2025-11-13 16:07:28 +01:00
Christian Hesse
b4c3f6c58f contrib/logo-color: drop width & height properties for images 2025-11-13 16:07:28 +01:00
Christian Hesse
fbeb1b53bb contrib/template-wifi: split off from Makefile 2025-11-13 16:07:28 +01:00
Christian Hesse
f3e5ba5024 INITIAL-COMMANDS: install from rsc.eworm.de 2025-11-13 16:07:28 +01:00
Christian Hesse
ff05d2e95d contrib/logo-color: place screenshots below each other...
... not side by side.
2025-11-13 16:07:28 +01:00
Christian Hesse
0215c54b4f contrib/template-local: split off from Makefile 2025-11-13 16:07:28 +01:00
Christian Hesse
e4eaa31a87 README: install from rsc.eworm.de 2025-11-13 16:07:28 +01:00
Christian Hesse
7c950b5bc2 general/style: make the blockquote darker 2025-11-13 16:07:28 +01:00
Christian Hesse
04fdbf17e7 contrib/template-capsman: split off from Makefile 2025-11-13 16:07:28 +01:00
Christian Hesse
5c7d7e017d fw-addr-lists.d/allow: use rsc.eworm.de in the list 2025-11-13 16:07:28 +01:00
Christian Hesse
6e4e3a50e5 Merge branch 'contrib-html-head-foot' into next 2025-11-13 16:07:28 +01:00
Christian Hesse
324a778671 fw-addr-lists.d/{allow,block}: use short url rsc.eworm.de 2025-11-13 16:07:28 +01:00
Christian Hesse
af340720cd Makefile: clean up and add phony targets 2025-11-13 16:07:28 +01:00
Christian Hesse
b07f155021 contrib/html: add a footer 2025-11-13 16:07:28 +01:00
Christian Hesse
22803175ed Merge branch 'contrib-html' into next 2025-11-13 16:07:28 +01:00
Christian Hesse
13d8e406a1 contrib/notification: add a head with eworm, QR code and caption 2025-11-13 16:07:28 +01:00
Christian Hesse
18782cf247 contrib/Makefile: hide the hint on broken site 2025-11-13 16:07:28 +01:00
Christian Hesse
6cae963934 contrib/logo-color: add a head with eworm, QR code and caption 2025-11-13 16:07:28 +01:00
Christian Hesse
4da39b9cbc contrib/html: add a head with eworm, QR code and caption 2025-11-13 16:07:28 +01:00
Christian Hesse
3240d27945 contrib/notification: hint on possibly broken site 2025-11-13 13:45:33 +01:00
Christian Hesse
25b5423239 contrib/logo-color: hint on possibly broken site 2025-11-13 13:45:33 +01:00
Christian Hesse
7a52d17b2a contrib/html: hide the hint on broken link 2025-11-13 13:45:33 +01:00
Christian Hesse
f614a92baf doc/mod/notification-telegram: hint on possibly broken link 2025-11-13 13:45:33 +01:00
Christian Hesse
52fabebd5c contrib: introduce Makefile...
... and update references in links.
2025-11-13 13:45:33 +01:00
Christian Hesse
0f55f1b703 contrib/logo-color: use relative reference in link
... without extra path elements.

This may break, depending on site.
2025-11-13 13:41:14 +01:00
Christian Hesse
0c7ec83d7c doc/mod/notification-telegram: use relative reference in link
This may break, depending on site.
2025-11-13 13:41:14 +01:00
Christian Hesse
f9bbe0e7af contrib/notification: format the values italic 2025-11-13 13:41:14 +01:00
Christian Hesse
9ac349e170 contrib/notification: update date format 2025-11-13 13:41:14 +01:00
Christian Hesse
c51c3e7a47 contrib/{logo-color,notification}: add navigation structure 2025-11-13 13:41:14 +01:00
Christian Hesse
3217ad1578 contrib/*: unify html code 2025-11-13 13:41:14 +01:00
Christian Hesse
6dbdc82e22 contrib/html: drop comma & ampersand from id/anchor 2025-11-13 13:41:09 +01:00
Christian Hesse
249706a01c contrib/html: properly handle anchors 2025-11-13 13:40:13 +01:00
Christian Hesse
bbc4bec966 contrib/html: link the logo with relative path 2025-11-13 13:40:13 +01:00
Christian Hesse
42568988cf contrib/html: increase default line height 2025-11-13 13:40:13 +01:00
Christian Hesse
db19c4cb43 contrib/html: add a margin on left and right...
... for windows in landscape (wider than high). Also make the
notification float right for landscape only.
2025-11-13 13:40:13 +01:00
Christian Hesse
bfa0148c9d contrib/html: include stylesheet via link 2025-11-13 13:40:11 +01:00
Christian Hesse
480e36bcf3 contrib/{logo-color,notification}: use a single style 2025-11-13 13:38:22 +01:00
Christian Hesse
128dfe0ff1 contrib/html: add empty lines...
... for easier rebasing.
2025-11-13 13:37:51 +01:00
Christian Hesse
fcc413ea26 README: add a sub-section for code hosting 2025-11-13 12:58:12 +01:00
Christian Hesse
9ab7d0a43b README: add the upstream url verbatim 2025-11-13 12:58:12 +01:00
Christian Hesse
5f0005baaf README: move the QR code 2025-11-13 12:58:12 +01:00
Christian Hesse
903c4bad41 Merge branch 'builtin-trust-store' into next 2025-11-13 12:58:12 +01:00
Christian Hesse
ae560a548c doc/mod/notification-matrix: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
c97ba60ca0 CERTIFICATES: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
be362c8da7 update-tunnelbroker: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
f7f97a458b telegram-chat: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
3e18e645d1 netwatch-dns: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
e29d9bc603 mod/notification-telegram: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
21c19a72a5 mod/notification-ntfy: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
3c695a6721 fw-addr-lists: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
468e2994c9 check-certificates: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
2d048d6e11 global-functions: $ScriptInstallUpdate: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
25e20dc0ef global-functions: $GetMacVendor: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
528edb7ea3 global-functions: $DownloadPackage: define certificate use 2025-11-13 12:58:12 +01:00
Christian Hesse
50d9106e2f global-functions: $CertificateAvailable: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-13 12:58:12 +01:00
Christian Hesse
f78d747226 INITIAL-COMMANDS: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-13 12:58:12 +01:00
Christian Hesse
e0e9dd9058 README: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-13 12:58:12 +01:00
11 changed files with 20 additions and 32 deletions

View file

@ -27,7 +27,7 @@ commitinfo: global-functions.rsc
docs: $(HTML)
%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html contrib/html.sh.d/foot.html
%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html
contrib/html.sh $< > $@
rsc: $(GEN_RSC)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

View file

@ -6,5 +6,8 @@ HTML := $(wildcard *.html)
all: docs
docs: static-html.sh $(HTML)
./static-html.sh $(HTML)
docs: $(HTML)
sed -i \
-e '/href=/s|\.md|\.html|' \
-e '/blockquote/s|/\*! display \*/|display: none;|' \
$(HTML)

View file

@ -6,14 +6,17 @@ RELTO="$(dirname "${1}")"
sed \
-e "s|__TITLE__|$(head -n1 "${1}")|" \
-e "s|__GENERAL__|$(realpath --relative-to="${RELTO}" general/)|" \
-e "s|__ROOT__|$(realpath --relative-to="${RELTO}" ./)|" \
-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" general/style.css)|" \
-e "s|__LOGO__|$(realpath --relative-to="${RELTO}" logo.png)|" \
-e "s|__EWORM__|$(realpath --relative-to="${RELTO}" general/eworm-meadow.avif)|" \
-e "s|__QR_CODE__|$(realpath --relative-to="${RELTO}" general/qr-code.png)|" \
-e "s|__CLIPBOARD__|$(realpath --relative-to="${RELTO}" general/clipboard.js)|" \
< "${0}.d/head.html"
markdown -f toc,idanchor "${1}" | sed \
-e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \
-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|' \
-e '/<h[1234] /s|-2[7cd]-||g' -e '/<h[1234] /s|--26-amp-3b-||g' \
-e '/<h[1234] /s|-2c-||g' -e '/<h[1234] /s|--26-amp-3b-||g' \
-e '/^<pre>/s|pre|pre onclick="CopyToClipboard(this)"|g' \
-e '/The above link may be broken on code hosting sites/s|blockquote|blockquote style="display: none;"|'

View file

@ -1,14 +1,14 @@
<!DOCTYPE html><html lang="en">
<head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>RouterOS Scripts :: __TITLE__</title>
<link rel="stylesheet" type="text/css" href="__GENERAL__/style.css">
<link rel="icon" type="image/png" href="__ROOT__/logo.png">
<script type="text/javascript" src="__GENERAL__/clipboard.js"></script>
<link rel="stylesheet" type="text/css" href="__STYLE__">
<link rel="icon" type="image/png" href="__LOGO__">
<script type="text/javascript" src="__CLIPBOARD__"></script>
</head><body>
<table><tr>
<td><img src="__GENERAL__/eworm-meadow.avif" alt="eworm on meadow" /></td>
<td><img src="__GENERAL__/qr-code.png" alt="QR code: rsc.eworm.de" /></td>
<td><img src="__EWORM__" alt="eworm on meadow" /></td>
<td><img src="__QR_CODE__" alt="QR code: rsc.eworm.de" /></td>
<td class="head"><span class="top">RouterOS Scripts</span><br />
<span class="bottom">a collection of scripts for MikroTik RouterOS</span></td>
</tr></table>

View file

@ -18,7 +18,7 @@
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<blockquote style="/* display */"><p>💡️ <strong>Hint</strong>: This site or links
<blockquote style="/*! display */"><p>💡️ <strong>Hint</strong>: This site or links
on it may be broken on code hosting sites. Use
<a href="https://rsc.eworm.de/main/contrib/logo-color.html">Logo Color Changer</a>
instead.</p></blockquote>

View file

@ -18,7 +18,7 @@
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<blockquote style="/* display */"><p>💡️ <strong>Hint</strong>: This site or links
<blockquote style="/*! display */"><p>💡️ <strong>Hint</strong>: This site or links
on it may be broken on code hosting sites. Use
<a href="https://rsc.eworm.de/main/contrib/notification.html">Notification Generator</a>
instead.</p></blockquote>

View file

@ -1,8 +0,0 @@
#!/bin/sh
set -e
sed -i \
-e '/href=/s|\.md|\.html|' \
-e '/blockquote/s|/\* display \*/|display: none;|' \
"${@}"

View file

@ -1,8 +1,4 @@
/* copy code to clipboard */
function CopyToClipboard(pre) {
pre.style.filter = 'invert(1)';
navigator.clipboard.writeText(pre.firstElementChild.innerHTML);
setTimeout(function() {
pre.style.filter = 'invert(0)';
}, 100);
}

View file

@ -69,12 +69,6 @@ pre code {
padding: 0;
border: 0;
}
pre::before {
content: "📋 Copy!";
float: right;
border: 1px solid #ccc;
border-radius: 3px;
}
span.link {
color: #863600;
}

View file

@ -132,7 +132,7 @@
}
:if ($AllDone = true && $QueueLen = [ :len $EmailQueue ]) do={
/system/scheduler/remove [ find where name="_FlushEmailQueue" ];
/system/scheduler/remove $Scheduler;
:set EmailQueue;
:return true;
}