From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 02:35:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:35:02 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=b573059059c4d65e289d5363da14ea9448e680d1;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:35:02 04.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 30f8a91e3..962cec949 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/503/d5d78c0f"; +:global CommitId "main/504/5bc7e86f"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:35: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 index 858263df7..000000000 --- a/html/certs/.#Makefile +++ /dev/null @@ -1 +0,0 @@ -root@amster.1174539 \ No newline at end of file diff --git a/html/certs/Makefile b/html/certs/Makefile index 8309737ca..6e5593db6 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -15,8 +15,8 @@ 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)) -CLEAN_ALL := $(addprefix clean-,$(TARGETS)) CLEAN_TARGETS := $(addprefix clean-list-,$(TARGETS)) +CLEAN_ALL := $(notdir $(LIST_DIRS)) # Big CA list with all certificates ~ 2Mb ALL_CA_URL := https://curl.se/ca/cacert.pem @@ -30,7 +30,7 @@ CURL := curl \ --silent \ --show-error -.PHONY: default help all clean clean-list all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(CLEAN_ALL) $(CLEAN_TARGETS) +.PHONY: default help all all-ca-lst download-list check-list clean-list clean $(TARGETS) $(CHECK_TARGETS) $(CLEAN_TARGETS) $(CLEAN_ALL) default: help @@ -49,10 +49,10 @@ help: all: all-ca-lst $(TARGETS) -clean: $(CLEAN_ALL) - clean-list: $(CLEAN_TARGETS) +clean: $(CLEAN_ALL) + all-ca-lst: @tmp="$$(mktemp)"; \ trap 'rm -f "$$tmp"' EXIT; \ @@ -89,15 +89,16 @@ $(FILE_TARGETS): %: $(LIST_ROOT)/Makefile.% $(DIR_TARGETS): %: $(LIST_ROOT)/% @$(MAKE) download-list LIST="$<" OUT_DIR="$@" -$(CHECK_TARGETS): check-%: +$(CHECK_TARGETS): check-list-%: @$(MAKE) check-list OUT_DIR="$*" -$(CLEAN_ALL): clean-%: - @$(MAKE) clean OUT_DIR="$*" - $(CLEAN_TARGETS): clean-list-%: @$(MAKE) clean-list OUT_DIR="$*" +$(CLEAN_ALL): %: $(LIST_ROOT)/% + @$(MAKE) clean LIST="$<" RM_DIR="$@" + + # List format: check-url download-url. Both may omit https://. # download-url may also be a local path. Downloaded files are named by CN. download-list: @@ -188,7 +189,8 @@ clean-list: true clean: - @echo "Remove directory $(OUT_DIR)"; \ + @echo "Remove directory $(RM_DIR)"; \ + @echo "List directory $(LIST)"; \ @echo "===> $@ done!" # @rm -rf $(BUILD_DIR)/$(OUT_DIR); \