]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 17:15:02 03.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Sun, 3 May 2026 14:15:03 +0000 (17:15 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Sun, 3 May 2026 14:15:03 +0000 (17:15 +0300)
html/AM-GlobalFunc.rsc
html/certs/Makefile
html/certs/lists/Makefile.ipall [moved from html/certs/Makefile.IPALL with 100% similarity]
html/certs/lists/Makefile.ipv4 [moved from html/certs/Makefile.IPV4 with 100% similarity]
html/certs/lists/Makefile.ipv6 [moved from html/certs/Makefile.IPV6 with 100% similarity]

index d136656a9e1c7dbde715964950cd202aff1ff767..9795045ba74baba34d61548a6ede90fa1bac47bd 100644 (file)
@@ -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;
index b780e6cbeb6a2a7e217c2ff9d2671f5d58f1cc7c..467fa56e30bd989e9c74d4f2dc8b9ef3ec6b4433 100644 (file)
@@ -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 $@)