]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:15:02 04.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 00:15:03 +0000 (03:15 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 00:15:03 +0000 (03:15 +0300)
html/AM-GlobalFunc.rsc
html/certs/.#Makefile [deleted symlink]
html/certs/Makefile

index ea4fb6c45dd399d6ed1a15fa92ec6efbd96ae96b..1bda409dca85ceb8d23f052c8eda0b03f7e5db94 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/478/9f594ec5";
+:global CommitId "main/479/2ccc0369";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:05:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:15:02 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
diff --git a/html/certs/.#Makefile b/html/certs/.#Makefile
deleted file mode 120000 (symlink)
index 858263d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-root@amster.1174539
\ No newline at end of file
index f4e90ee2bf923f9e646251217a28ede02b76f28e..53a77962ba0f0ded42d538b7e30ab9b4208d51a3 100644 (file)
@@ -15,6 +15,7 @@ LIST_DIRS := $(filter-out $(LIST_ROOT)/Makefile.%,$(wildcard $(LIST_ROOT)/*))
 DIR_TARGETS := $(notdir $(LIST_DIRS))
 TARGETS := $(sort $(FILE_TARGETS) $(DIR_TARGETS))
 CHECK_TARGETS := $(addprefix check-,$(TARGETS))
+URLS_TARGETS := $(addprefix urls-,$(TARGETS))
 CLEAN_TARGETS := $(addprefix clean-,$(TARGETS))
 
 # Big CA list with all certificates ~ 2Mb
@@ -29,7 +30,7 @@ CURL := curl \
        --silent \
        --show-error
 
-.PHONY: default help all clean all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(CLEAN_TARGETS)
+.PHONY: default help all clean all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(URLS_TARGETS) $(CLEAN_TARGETS)
 
 default: help
 
@@ -88,6 +89,9 @@ $(DIR_TARGETS): %: $(LIST_ROOT)/%
 $(CHECK_TARGETS): check-%:
        @$(MAKE) check-list OUT_DIR="$*"
 
+$(URLS_TARGETS): urls-%:
+       @$(MAKE) urls-list OUT_DIR="$*"
+
 $(CLEAN_TARGETS): clean-%:
        @$(MAKE) clean-list OUT_DIR="$*"
 
@@ -130,7 +134,6 @@ download-list:
                        mv -- "$$tmp" "$$out"; \
                        printf 'SAVED: %s\n' "$$out"; \
                        printf '%s\t%s\t%s\t%s\n' "$$check_url" "$$download_url" "$$out" "$$cn" >> "$(OUT_DIR)/$(INDEX_FILE)"; \
-                       printf '%s\t%s\t%s\t%s\n' "$$check_url" "$$download_url" "$$out" "$$cn" >> "$(OUT_DIR)/$(INDEX_FILE)"; \
                done < "$$list"; \
        done; \
        true
@@ -149,6 +152,20 @@ check-list:
        done < "$(OUT_DIR)/$(INDEX_FILE)"; \
        true
 
+urls-list:
+       @test -n "$(OUT_DIR)" || { echo "OUT_DIR is required" >&2; exit 2; }
+       @if [ ! -f "$(OUT_DIR)/$(INDEX_URLS)" ]; then \
+               echo "WARN: missing $(OUT_DIR)/$(INDEX_URLS); run make $(OUT_DIR) first" >&2; \
+               exit 0; \
+       fi; \
+       while IFS=$$'\t' read -r check_url download_url pem cn || [ -n "$$check_url" ]; do \
+               [ -n "$$check_url" ] || continue; \
+               printf 'Checking %s with %s (%s)\n' "$$check_url" "$$pem" "$$cn"; \
+               $(CURL) --output /dev/null --cacert "$$pem" "$$check_url" || \
+                       echo "WARN: check failed for $$check_url with $$pem" >&2; \
+       done < "$(OUT_DIR)/$(INDEX_URLS)"; \
+       true
+
 clean-list:
        @test -n "$(OUT_DIR)" || { echo "OUT_DIR is required" >&2; exit 2; }
        @if [ ! -f "$(OUT_DIR)/$(INDEX_FILE)" ]; then \