Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:20:03 02.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index bed73610876eff6677ff701503c5907369563aa1..b4c33a71ff94817cee8d6fc0d75ebf2f154a7907 100644 (file)
--- 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/405/b8931cc0";
+:global CommitId "main/406/7c5c7a96";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:55:02 02.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:20:03 02.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/certs/Makefile b/html/certs/Makefile
index 673c92fddfd37d5b25c8e286bc182f40f13c6073..4aef7f752c7bb64d78359d9611bb0009c5fc409a 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -14,6 +14,8 @@ CALIST:= true
 IPV4_URLS  := $(wildcard Makefile.IPV4)
 IPV6_URLS  := $(wildcard Makefile.IPV6)
 IPALL_URLS := $(wildcard Makefile.IPALL)
+# Big CA list with all certificates ~ 2Mb
+CALIST_URL = https://curl.se/ca/cacert.pem
 
 CURL  ?= $(shell which curl)
 CURL  ?= $(CURL) -sS --fail --max-time 10 --silent
@@ -29,42 +31,9 @@ ifdef IPVALL
 CURL  := $(CURL) -4 -6
 endif
 
+.PHONY: default help ca-list ca-ipv4 ca-ipv6 ca-ipall
 
-IPV4 = \
-       1.1.1.1/SSL-com-Root-Certification-Authority-ECC \
-       8.8.8.8/GTS-Root-RX \
-       9.9.9.9/DigiCert-Global-Root-G3 \
-       api.mullvad.net/ISRG-Root-X1 \
-       ipv4.showipv6.de/ISRG-Root-X1 \
-       ipv4.tunnelbroker.net/Starfield-Root-Certificate-Authority-G2 \
-       mkcert.org/ISRG-Root-X1 \
-       mkcert.org/DigiCert-Global-Root-G3 \
-       mkcert.org/DigiCert-TLS-RSA4096-Root-G5 \
-       mkcert.org/DigiCert-TLS-ECC-P384-Root-G5 \
-       mkcert.org/DigiCert-Global-Root-G2 \
-       ntfy.sh/ISRG-Root-X1 \
-       www.dshield.org/GTS-Root-R4 \
-       www.spamhaus.org/GTS-Root-R4
-IPV6 = \
-       [2606\:4700\:4700\:\:1111]/SSL-com-Root-Certification-Authority-ECC \
-       [2001\:4860\:4860\:\:8888]/GTS-Root-RX \
-       [2620\:fe\:\:9]/DigiCert-Global-Root-G3 \
-       ipv6.showipv6.de/ISRG-Root-X1
-BOTH = \
-       api.macvendors.com/GTS-Root-R4 \
-       api.telegram.org/Go-Daddy-Root-Certificate-Authority-G2 \
-       cloudflare-dns.com/SSL-com-Root-Certification-Authority-ECC \
-       dns.google/GTS-Root-RX \
-       dns.quad9.net/DigiCert-Global-Root-G3 \
-       gitlab.com/USERTrust-RSA-Certification-Authority \
-       lists.blocklist.de/GTS-Root-R4 \
-       matrix.org/GTS-Root-R4 \
-       raw.githubusercontent.com/ISRG-Root-X1 \
-       upgrade.mikrotik.com/ISRG-Root-X1
-
-.PHONY: default help big-ca-list $(BOTH) $(IPV4) $(IPV6)
-
-all: big-ca-list
+all: ca-list
 
 default: help
 
@@ -75,25 +44,20 @@ help:
                 echo "  default: Show this help message"; \
                 echo "  all: Download BIG CA list using target big-ca-list"; \
                 echo "  big-ca-list: Download the big CA list from curl.se"; \
-                echo "  $(BOTH): Check certificates for both IPV4 and IPV6 domains"; \
-                echo "  $(IPV4): Check certificates for IPV4 domains"; \
-                echo "  $(IPV6): Check certificates for IPV6 domains"; \
+                echo "  ca-list: Check certificates for both IPV4 and IPV6 domains"; \
+                echo "  ca-ipv4: Check certificates for IPV4 domains"; \
+                echo "  ca-ipv6: Check certificates for IPV6 domains"; \
+                echo "  ca-ipall: Check certificates for all IP versions"; \
                 echo "  help: Show this help message\n"; \
                 echo "Environment variables:"; \
-                echo "  NOIPV4: Set to true to skip IPv4 checks"; \
-                echo "  NOIPV6: Set to true to skip IPv6 checks\n"; \
-                echo "Examples:"; \
-                echo "  make all NOIPV6=true"; \
-                echo "  make $(IPV4) NOIPV4=true"; \
+                echo "  IPV4=true: Enable IPV4 checks and downloads all available certificates from Makefile.IPV4 to ca-ipv4 directory (default)"; \
+                echo "  IPV6=true: Enable IPV6 checks and downloads all available certificates from Makefile.IPV6 to ca-ipv6 directory (default: false)"; \
+                echo "  IPALL=true: Enable checks for all IP versions and downloads all available certificates from Makefile.IPALL to ca-ipall directory (default: false)"; \
+                echo "  CALIST=true: Enable downloading the big CA list from curl.se to ca-list directory (default: true)"; \
        }
 
-#$(BIG_CA_DIR):
-#      mkdir -p $@ && cd $@
-
-$(BIG_CA_URL): $(BIG_CA_DIR)
-       $(BIG_CA_CMD) $@ $^
-
-big-ca-list: $(BIG_CA_URL)
+ca-list: $(CA)
+    mkdir -p $@ && cd $@; \
 
 $(BOTH):