From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sun, 3 May 2026 14:15:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 17:15:02 03.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=48e35b0dfac68fe4da3b477e3b4218df2f96ba6b;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 17:15:02 03.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index d136656a9..9795045ba 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/427/9d16fff5"; +:global CommitId "main/428/6e628c52"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 17:05:03 03.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 17:15:02 03.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index b780e6cbe..467fa56e3 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -10,9 +10,9 @@ IPV4 = true IPV6 = false IPALL = false -IPV4_URLS := $(wildcard Makefile.IPV4) -IPV6_URLS := $(wildcard Makefile.IPV6) -IPALL_URLS := $(wildcard Makefile.IPALL) +IPV4_URLS := $(wildcard lists/Makefile.ipv4) +IPV6_URLS := $(wildcard lists/Makefile.ipv6) +IPALL_URLS := $(wildcard lists/Makefile.ipall) # Big CA list with all certificates ~ 2Mb ALL_CA_URL = https://curl.se/ca/cacert.pem @@ -41,10 +41,15 @@ all-ca-lst: mkdir -p $@ && cd $@ $(CURL) $(ALL_CA_URL) --output $(notdir $<) -ca-ipv4: +ipv4: $(IPV4_URLS) + @mkdir -p $@ && cd $@ && \ @$(MAKE) $(IPV4_URLS) +ipv6: $(IPV6_URLS) + +ipall: $(IPALL_URLS) + .PHONY: $(IPV4_URLS) $(IPV4_URLS): $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@) diff --git a/html/certs/Makefile.IPALL b/html/certs/lists/Makefile.ipall similarity index 100% rename from html/certs/Makefile.IPALL rename to html/certs/lists/Makefile.ipall diff --git a/html/certs/Makefile.IPV4 b/html/certs/lists/Makefile.ipv4 similarity index 100% rename from html/certs/Makefile.IPV4 rename to html/certs/lists/Makefile.ipv4 diff --git a/html/certs/Makefile.IPV6 b/html/certs/lists/Makefile.ipv6 similarity index 100% rename from html/certs/Makefile.IPV6 rename to html/certs/lists/Makefile.ipv6