From 675c22ecffa1954e21b93366c27c62060b6c0f84 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 12 Mar 2026 02:05:36 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:05:35 12.03.2026. --- Makefile | 20 ++-- bin/check_repo.sh | 21 ++--- bin/test.sh | 11 +++ html/.tmpl/404.html | 19 ++++ html/.tmpl/40x.html | 19 ++++ html/.tmpl/50x.html | 19 ++++ html/.tmpl/bot.html | 11 +++ html/.tmpl/foot.html | 5 + html/.tmpl/head.html | 31 +++++++ html/.tmpl/index.html | 30 ++++++ html/.tmpl/md_tmpl.html | 64 +++++++++++++ html/.tmpl/top.html | 179 ++++++++++++++++++++++++++++++++++++ html/AM-GlobalFunc.rsc | 4 +- html/logo/index.html | 72 +++++++++++++++ html/logo/notification.html | 96 +++++++++++++++++++ 15 files changed, 578 insertions(+), 23 deletions(-) create mode 100755 bin/test.sh create mode 100644 html/.tmpl/404.html create mode 100644 html/.tmpl/40x.html create mode 100644 html/.tmpl/50x.html create mode 100644 html/.tmpl/bot.html create mode 100644 html/.tmpl/foot.html create mode 100644 html/.tmpl/head.html create mode 100644 html/.tmpl/index.html create mode 100644 html/.tmpl/md_tmpl.html create mode 100644 html/.tmpl/top.html create mode 100644 html/logo/index.html create mode 100644 html/logo/notification.html diff --git a/Makefile b/Makefile index e2238220d..31a0d81d2 100644 --- a/Makefile +++ b/Makefile @@ -37,11 +37,19 @@ export BUILD_DIR REPO_DIR ALL_RSC GLOB_RSC .DEFAULT_GOAL := run -.PHONY: run check notify test -#checksums $(commitinfo.sh) +.PHONY: run check notify checksums $(commitinfo.sh) test run: check -# @echo "[run] start main flow" + @echo "[run] exit 0, go to checksums..." + @$(MAKE) checksums + @echo "[run] checksums.sh exit 0. Go to commitinfo.sh..." + @$(MAKE) $(commitinfo.sh) + @echo "[run] commitinfo.sh exit 0. Go to repo add, commit and push..." + cd $(BUILD_DIR) + ls -la . + git add . + git commit -am '$(COMM_INFO)' + git push @echo "[run] done" check: @@ -53,11 +61,11 @@ notify: checksums: checksums.json checksums.json: bin/checksums.sh $(ALL_RSC) - bin/checksums.sh > html/tmp/checksums.json + bin/checksums.sh > html/tmp/$@ $(commitinfo.sh): $(GLOB_RSC) - $(commitinfo.sh) $< > $<~ - mv $<~ $< + $(commitinfo.sh) $< > $<~ + mv $<~ $< test: @bash -n bin/check_repo.sh diff --git a/bin/check_repo.sh b/bin/check_repo.sh index 44a443ef3..65a1ee158 100755 --- a/bin/check_repo.sh +++ b/bin/check_repo.sh @@ -6,25 +6,16 @@ dirty="$(git status --porcelain || true)" diff="$(git diff --quiet && git diff --cached --quiet || true)" lsfiles="$(git ls-files --others --exclude-standard || true)" -if [[ -n "$diff" && -z "$lsfiles" ]]; then - echo "[check] repo diff, go to proclean check." +if [[ -n "$diff" && -n "$lsfiles" ]]; then + echo "[check_repo] repo diff, go to proclean check." if [[ -n "$dirty" ]]; then - echo "[check] repo dirty, stop" + echo "[check_repo] repo dirty, stop" bash scripts/notify_telegram.sh "STOP: repo dirty in $(pwd)" exit 1 else - echo "[check] repo clean" + echo "[check_repo] repo clean" fi else - echo "[check] not clean. Go to autocommit him." - if [[ -z "$lsfiles" ]]; then - echo "[check] Git add..." - git add . - git commit -m "${COMM_INFO}" - else - echo "[check] Git -v branch..." - git -v brnch - git commit -am "${COMM_INFO}" - fi - git push + echo "[check_repo] not clean. Exit 0 from check_repo.sh." + exit 0 fi diff --git a/bin/test.sh b/bin/test.sh new file mode 100755 index 000000000..105e3a273 --- /dev/null +++ b/bin/test.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +cd "${REPO_DIR:-.}" + +dirty="$(git status --porcelain || true)" +diff="$(git diff --quiet && git diff --cached --quiet || true)" +lsfiles="$(git ls-files --others --exclude-standard || true)" + +if [[ -n "$lsfiles" ]]; then + echo "[check] Git add..." +fi diff --git a/html/.tmpl/404.html b/html/.tmpl/404.html new file mode 100644 index 000000000..a0727645e --- /dev/null +++ b/html/.tmpl/404.html @@ -0,0 +1,19 @@ + + + +Error 404 + + + +

An error occurred. 404

+

Sorry, the page you are looking for is currently unavailable.
+Please try again later.

+

If you are the system administrator of this resource then you should check +the error log for details.

+

Faithfully yours, nginx.

+ + diff --git a/html/.tmpl/40x.html b/html/.tmpl/40x.html new file mode 100644 index 000000000..a0727645e --- /dev/null +++ b/html/.tmpl/40x.html @@ -0,0 +1,19 @@ + + + +Error 404 + + + +

An error occurred. 404

+

Sorry, the page you are looking for is currently unavailable.
+Please try again later.

+

If you are the system administrator of this resource then you should check +the error log for details.

+

Faithfully yours, nginx.

+ + diff --git a/html/.tmpl/50x.html b/html/.tmpl/50x.html new file mode 100644 index 000000000..a57c2f93d --- /dev/null +++ b/html/.tmpl/50x.html @@ -0,0 +1,19 @@ + + + +Error + + + +

An error occurred.

+

Sorry, the page you are looking for is currently unavailable.
+Please try again later.

+

If you are the system administrator of this resource then you should check +the error log for details.

+

Faithfully yours, nginx.

+ + diff --git a/html/.tmpl/bot.html b/html/.tmpl/bot.html new file mode 100644 index 000000000..221dbfdbc --- /dev/null +++ b/html/.tmpl/bot.html @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/html/.tmpl/foot.html b/html/.tmpl/foot.html new file mode 100644 index 000000000..9e28e115c --- /dev/null +++ b/html/.tmpl/foot.html @@ -0,0 +1,5 @@ + +

RouterOS Scripts documentation generated on __DATE__ for __VERSION__
+Copyright © 2013-2026 Christian Hesse <mail@eworm.de>

+ + diff --git a/html/.tmpl/head.html b/html/.tmpl/head.html new file mode 100644 index 000000000..995694c66 --- /dev/null +++ b/html/.tmpl/head.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + +
[Amster] RouterOS Scripts
+ Welcome to new, optimized and fixed RouterOS scripts! +

+

+ +
+
+ + +

 

+
diff --git a/html/.tmpl/index.html b/html/.tmpl/index.html new file mode 100644 index 000000000..e7c71085b --- /dev/null +++ b/html/.tmpl/index.html @@ -0,0 +1,30 @@ + + + +Welcome to Amster! + + + + + +

Welcome to Amster!

+

If you see this page, Amster web server is successfully installed and +working. Further configuration is required.

+ +

For online documentation and support please refer to +nginx.org.
+Commercial support is available at +nginx.com.

+ +

Thank you for using nginx.

+
+

>>> amster-scripts <<<

+

>>> logo <<<

+

>>> notifications <<<

+
+ + diff --git a/html/.tmpl/md_tmpl.html b/html/.tmpl/md_tmpl.html new file mode 100644 index 000000000..09737d78b --- /dev/null +++ b/html/.tmpl/md_tmpl.html @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + +
[Amster] RouterOS Scripts
+ Welcome to new, optimized and fixed RouterOS scripts! +

+

+ +
+
+ + +

 

+
+ {{content}} +
+ +
+ +
+
+ + diff --git a/html/.tmpl/top.html b/html/.tmpl/top.html new file mode 100644 index 000000000..40d97c357 --- /dev/null +++ b/html/.tmpl/top.html @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 82235a229..d6b149923 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -16,9 +16,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/80/71f092a6"; +:global CommitId "main/83/1548044b"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:51:02 09.03.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:05:36 12.03.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/logo/index.html b/html/logo/index.html new file mode 100644 index 000000000..e4e3633c3 --- /dev/null +++ b/html/logo/index.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + +
[Amster] RouterOS Scripts
+ Welcome to new, optimized and fixed RouterOS scripts! +

+

+ +
+
+ + +

 

+
+ +

Logo Color Changer

+ + +

Select the colors here: + + + +

+
+⬆️ Go back to top

+ +
+ +
+ diff --git a/html/logo/notification.html b/html/logo/notification.html new file mode 100644 index 000000000..7fd6214ca --- /dev/null +++ b/html/logo/notification.html @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + +
[Amster] RouterOS Scripts
+ Welcome to new, optimized and fixed RouterOS scripts! +

+

+ +
+
+ + +

 

+
+ +

Notification Generator

+
+
+ +
+

[MikroTik] ℹ️ Subject +

+
Message
+ +

⏰ This message was queued since 2026-02-10 + 10:21:11 and may be obsolete.

+

✂️ The message was too long and has been truncated, cut off 13%!

+
+
+ +

Hostname:

+

Subject:

+

Message:

+

Show link:

+

Queued since

+

Cut-off with percent

+ +

Then right-click, click "Take Screenshot" and finally select the + notification and download it.

+ +

⬆️ Go back to top

+
+ +
+ +
+
+ + -- 2.52.0