From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sun, 3 May 2026 16:50:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:50:02 03.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=ebdedff224bf7d76d22ff887e14d39e4468f6322;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:50:02 03.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index d476a0580..6f7f4cd92 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/439/41b81333"; +:global CommitId "main/440/b18a276b"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:45:02 03.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:50:02 03.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index 76cdaa11b..5b929db27 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -16,6 +16,8 @@ TARGETS := $(sort $(FILE_TARGETS) $(DIR_TARGETS)) # Big CA list with all certificates ~ 2Mb ALL_CA_URL := https://curl.se/ca/cacert.pem CA_LIST_DIR := ca-list +ALL_CA_FILE := $(CA_LIST_DIR)/cacert.pem +WITH_ALL_CA ?= false CURL := curl \ --globoff \ @@ -29,14 +31,17 @@ CURL := curl \ default: @echo "Available targets: $(TARGETS) all-ca-lst" + @echo "Set WITH_ALL_CA=true to include all-ca-lst in all" @echo "List format: [scheme://]host[/path/to/generator]/certificate-basename" @echo "Example: example.com/pki/acme/ISRG-Root-X1 checks https://example.com/pki/acme/ with ./ISRG-Root-X1.pem" -all: $(TARGETS) +all: $(TARGETS) $(if $(filter true,$(WITH_ALL_CA)),all-ca-lst,) -all-ca-lst: - @mkdir -p $(CA_LIST_DIR) - $(CURL) $(ALL_CA_URL) --output $(CA_LIST_DIR)/cacert.pem +all-ca-lst: $(ALL_CA_FILE) + +$(ALL_CA_FILE): + @mkdir -p $(dir $@) + $(CURL) $(ALL_CA_URL) --output $@ $(FILE_TARGETS): %: $(LIST_ROOT)/Makefile.% @$(MAKE) check-list LIST="$<" IP_FLAGS="$(call ip_flags,$@)"