Compare commits

..

37 commits

Author SHA1 Message Date
Christian Hesse
88155d901a Merge branch 'builtin-trust-store' into next 2025-11-10 12:16:22 +01:00
Christian Hesse
fd9c892a50 README: add a line break before command 2025-11-10 12:16:22 +01:00
Christian Hesse
a7876e9833 doc/mod/notification-matrix: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
8a45e4836a fw-addr-lists.d/allow: use rsc.eworm.de in the list 2025-11-10 12:16:22 +01:00
Christian Hesse
617f67f2b7 CERTIFICATES: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
4b5a3f7f90 fw-addr-lists.d/{allow,block}: use short url rsc.eworm.de 2025-11-10 12:16:22 +01:00
Christian Hesse
3be8ea0fb6 update-tunnelbroker: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
780a177ae6 Makefile: clean up and add phony targets 2025-11-10 12:16:22 +01:00
Christian Hesse
1272eb2aa8 telegram-chat: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
c08ed68e86 global-functions: $ScriptInstallUpdate: extra actions on 'not found' only 2025-11-10 12:16:22 +01:00
Christian Hesse
d2ea8b8d45 netwatch-dns: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
128526536e global-functions: $ScriptInstallUpdate: either or...
... but not both.
2025-11-10 12:16:22 +01:00
Christian Hesse
089f95d5c9 mod/notification-telegram: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
4ac9d6c09f global-functions: $ScriptInstallUpdate: give hint on ignore
Fixes: https://github.com/eworm-de/routeros-scripts/issues/112
2025-11-10 12:16:22 +01:00
Christian Hesse
90ce3db2f9 mod/notification-ntfy: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
b9a72ef9c0 contrib/checksums.sh: output to stdout...
... and let the Makefile redirect.
2025-11-10 12:16:22 +01:00
Christian Hesse
62deb6aae3 fw-addr-lists: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
a57abbc685 Merge branch 'contrib' into next 2025-11-10 12:16:22 +01:00
Christian Hesse
ec2401b5c3 check-certificates: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
96f61be2e2 contrib/notification: format the values italic 2025-11-10 12:16:22 +01:00
Christian Hesse
268b8b6abe global-functions: $ScriptInstallUpdate: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
4102b49637 contrib/notification: update date format 2025-11-10 12:16:22 +01:00
Christian Hesse
dd019a71c8 global-functions: $GetMacVendor: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
ebd84d1540 contrib/{logo-color,notification}: add navigation structure 2025-11-10 12:16:22 +01:00
Christian Hesse
d845b1878b global-functions: $DownloadPackage: define certificate use 2025-11-10 12:16:22 +01:00
Christian Hesse
8a278569e7 contrib/*: unify html code 2025-11-10 12:16:22 +01:00
Christian Hesse
d2f055a554 global-functions: $CertificateAvailable: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-10 12:16:22 +01:00
Christian Hesse
9a88b6c878 contrib/html.sh: drop comman from id/anchor 2025-11-10 12:16:22 +01:00
Christian Hesse
4e1db10a6e INITIAL-COMMANDS: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-10 12:16:22 +01:00
Christian Hesse
4f55808ce0 contrib/html.sh: properly handle anchors 2025-11-10 12:16:22 +01:00
Christian Hesse
962b082672 README: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-10 12:16:22 +01:00
Christian Hesse
6887d816bf contrib/html.sh: link the logo with relative path 2025-11-10 12:16:22 +01:00
Christian Hesse
787feedbb5 contrib/html.sh: increase default line height 2025-11-10 12:16:22 +01:00
Christian Hesse
12b1572208 contrib/html.sh: add a margin on left and right...
... for windows in landscape (wider than high).
2025-11-10 12:16:22 +01:00
Christian Hesse
0af5d516a3 contrib/html.sh: link the stylesheet from top level...
... and copy it there in Makefile.
2025-11-10 12:16:22 +01:00
Christian Hesse
ec8a38d67b contrib/html.sh: include stylesheet via link 2025-11-10 12:16:22 +01:00
Christian Hesse
5726573933 contrib/{logo-color,notification}: use a single style 2025-11-10 12:16:22 +01:00
12 changed files with 28 additions and 62 deletions

1
.gitignore vendored
View file

@ -7,6 +7,7 @@
*.rej
# html files (as generated from markdown)
style.css
*.html
# checksums file as used by $ScriptInstallUpdate

View file

@ -6,7 +6,7 @@ ALL_RSC := $(wildcard *.rsc */*.rsc)
GEN_RSC := $(wildcard *.capsman.rsc *.local.rsc *.wifi.rsc)
MARKDOWN := $(wildcard *.md doc/*.md doc/mod/*.md)
HTML := $(MARKDOWN:.md=.html)
HTML := $(MARKDOWN:.md=.html) style.css
.PHONY: all checksums docs rsc clean
@ -19,7 +19,10 @@ checksums.json: contrib/checksums.sh $(ALL_RSC)
docs: $(HTML)
%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html
style.css: contrib/general/style.css
cp $< $@
%.html: %.md style.css contrib/html.sh contrib/html.sh.d/head.html
contrib/html.sh $< > $@
rsc: $(GEN_RSC)

View file

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

Before After
Before After

View file

@ -404,7 +404,7 @@ immediately remove the link in question.
Upstream
--------
[![upstream](general/qr-code.png)](https://rsc.eworm.de/)
[![upstream](README.d/upstream.png)](https://rsc.eworm.de/)
URL:
[GitHub.com](https://github.com/eworm-de/routeros-scripts#routeros-scripts)

View file

@ -1,10 +0,0 @@
# Makefile
HTML := $(wildcard *.html)
.PHONY: all docs
all: docs
docs: $(HTML)
sed -i '/href=/s|\.md|\.html|' $(HTML)

View file

@ -5,6 +5,12 @@ body {
font-size: 10pt;
line-height: 1.6;
}
@media only screen and (orientation: landscape) {
body {
margin-left: 10vw;
margin-right: 10vw;
}
}
h2 {
border-bottom: 1px solid #ccc;
color: #000;
@ -18,7 +24,7 @@ a:hover {
blockquote {
border-left: 4px solid #ccc;
padding: 0 10px;
color: #555;
color: #777;
}
code {
margin: 0 2px;
@ -29,7 +35,7 @@ code {
}
div.notification {
position: relative;
float: none;
float: right;
width: 600px;
border: 3px outset #6c5d53;
/* border-radius: 5px; */
@ -68,24 +74,3 @@ pre code {
span.link {
color: #863600;
}
td.head-top {
height: 48px;
vertical-align: bottom;
font-size: 250%;
font-weight: bold;
}
td.head-bottom {
height: 48px;
vertical-align: top;
font-size: 125%;
color: #555;
}
@media only screen and (orientation: landscape) {
body {
margin-left: 10vw;
margin-right: 10vw;
}
div.notification {
float: right;
}
}

View file

@ -5,13 +5,11 @@ set -e
RELTO="$(dirname "${1}")"
sed \
-e "s|__TITLE__|$(head -n1 "${1}")|" \
-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" general/style.css)|" \
-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" 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)|" \
< "${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|-2c-||g' -e '/<h[1234] /s|--26-amp-3b-||g'
-e '/<h[1234] /s|-2c-||'
printf '</body></html>'

View file

@ -4,14 +4,3 @@
<link rel="stylesheet" type="text/css" href="__STYLE__">
<link rel="icon" type="image/png" href="__LOGO__">
</head><body>
<table>
<tr>
<td rowspan=2><img src="__EWORM__" alt="eworm on meadow"></td>
<td rowspan=2><img src="__QR_CODE__" alt="QR code: rsc.eworm.de"></td>
<td class="head-top">RouterOS Scripts</td>
</tr>
<tr>
<td class="head-bottom">a collection of scripts for MikroTik RouterOS</td>
</tr>
</table>
<hr>

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 :: Logo Color Changer</title>
<link rel="stylesheet" type="text/css" href="../general/style.css">
<link rel="stylesheet" type="text/css" href="general/style.css">
<link rel="icon" type="image/png" href="../logo.png">
<script src="logo-color.d/script.js"></script>
</head><body>
<h1>Logo Color Changer</h1>
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<p><a href="../README.html">⬅️ Go back to main README</a></p>
<p>You want the logo for your own notifications? But you joined the
<a href="https://t.me/routeros_scripts">Telegram Group</a> and want
@ -24,20 +24,20 @@ something that differentiates? Color it!</p>
<p>Then right-click, click "<i>Take Screenshot</i>" and finally select the
logo and download it.</p>
<p><img src="logo-color.d/browser-01.avif" width=533 height=482 alt="Screenshot Browser 01"></p>
<p><img src="logo-color.d/browser-02.avif" width=533 height=482 alt="Screenshot Browser 02"></p>
<p><img src="logo-color.d/browser-03.avif" width=533 height=482 alt="Screenshot Browser 03"></p>
<p><img src="logo-color.d/browser-01.avif" width=533 height=482 alt="Screenshot Browser 01">
<img src="logo-color.d/browser-02.avif" width=533 height=482 alt="Screenshot Browser 02">
<img src="logo-color.d/browser-03.avif" width=533 height=482 alt="Screenshot Browser 03"></p>
<p>(This example is with
<a href="https://www.mozilla.org/de/firefox/new/">Firefox</a>. The workflow
for other browsers may differ.)</p>
<p>See how to
<a href="../doc/mod/notification-telegram.md#set-a-profile-photo">Set
<a href="../../about/doc/mod/notification-telegram.md#set-a-profile-photo">Set
a profile photo</a> for your Telegram bot.</p>
<hr />
<p><a href="../README.md">⬅️ Go back to main README</a><br/>
<p><a href="../README.html">⬅️ Go back to main README</a><br/>
<a href="#top">⬆️ Go back to top</a></p>
</body></html>

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 :: Notification Generator</title>
<link rel="stylesheet" type="text/css" href="../general/style.css">
<link rel="stylesheet" type="text/css" href="general/style.css">
<link rel="icon" type="image/png" href="../logo.png">
<script src="notification.d/script.js"></script>
</head><body>
<h1>Notification Generator</h1>
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<p><a href="../README.html">⬅️ Go back to main README</a></p>
<div class="notification">
<img src="../logo.svg" alt="logo" class="logo" width=48 height=48>
@ -33,6 +33,6 @@ notification and download it.</p>
<hr />
<p><a href="../README.md">⬅️ Go back to main README</a><br/>
<p><a href="../README.html">⬅️ Go back to main README</a><br/>
<a href="#top">⬆️ Go back to top</a></p>
</body></html>

View file

@ -107,7 +107,7 @@ chat with [BotFather ↗️](https://t.me/BotFather) and set it there.
![set profile photo](notification-telegram.d/setuserpic.avif)
Have a look at my
[RouterOS-Scripts Logo Color Changer](../../contrib/logo-color.html)
[RouterOS-Scripts Logo Color Changer](https://git.eworm.de/cgit/routeros-scripts/plain/contrib/logo-color.html)
to create a colored version of this scripts' logo.
See also

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB