Autocommit in repo: ros.vados.ru, generated by owner: root, in 00:35:02 02.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 2c6a7decc5502a4a7927b47e25f851d0e97d39ba..448dc38bc024278a7a1d563152f3245516a305a7 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/394/a954404f";
+:global CommitId "main/395/35dcbf44";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 23:30:02 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 00:35:02 02.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/certs/Makefile b/html/certs/Makefile
index 8841c89bf9cdc228b221bb28425f951f84bb5a51..c6e7db882f86bca38ac854a5838b31c25f22c02a 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -1,11 +1,17 @@
 # Makefile to check certificates
 #SHELL=                /bin/sh
 
-DIR_CURRENT := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-PWD_DIR       = $(shell pwd)
+PWD_DIR = $(shell pwd)
+CERTS_DIR?= ./certs
+CERTS_DIR:= $($PWD_DIR $(abspath $(CERTS_DIR)))
 
-GLOB_ROOT_CA = https://curl.se/ca/cacert.pem
-FETCH_CMD = curl -s -o
+#CERTS_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
+# Big CA list with all certificates ~ 2Mb
+BIG_CA_URL = https://curl.se/ca/cacert.pem
+BIG_CA_CMD = curl -s -o
+BIG_CA_DIR?= $(CERTS_DIR)/all-ca
+BIG_CA_DIR:= $(abspath $(BIG_CA_DIR))
 
 #CONTRIB?=     ../contrib
 #CONTRIB:=     $(abspath $(CONTRIB))
@@ -20,18 +26,7 @@ FETCH_CMD = curl -s -o
 NOIPV4 ?= false
 NOIPV6 ?= false
 
-DOMAINS_DUAL = \
-       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
-DOMAINS_IPV4 = \
+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 \
@@ -46,20 +41,34 @@ DOMAINS_IPV4 = \
        ntfy.sh/ISRG-Root-X1 \
        www.dshield.org/GTS-Root-R4 \
        www.spamhaus.org/GTS-Root-R4
-DOMAINS_IPV6 = \
+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: 
-#$(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+.PHONY: default help big-ca-list dual ipv4 ipv6
+
+all: big-ca-list
+
+default: help
 
-default:
 help:
     @{ \
                 echo "Usage: make [target]"; \
                 echo "Targets:"; \
+                echo "  default: Show this help message"; \
                 echo "  all: Check all certificates (DUAL, IPV4, IPV6)"; \
                 echo "  dual: Check certificates for DUAL domains"; \
                 echo "  ipv4: Check certificates for IPV4 domains"; \
@@ -73,18 +82,24 @@ help:
                 echo "  make dual NOIPV4=true"; \
        }
 
-dual: $(DOMAINS_DUAL)
-
-#$(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+$(BIG_CA_DIR):
+       mkdir -p $@ && cd $@
 
-$(DOMAINS_DUAL):
+$(BIG_CA_CMD):
 ifndef NOIPV4
-       $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
-endif
-ifndef NOIPV6
-       $(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@)
+    $(BIG_CA_CMD):= $@ -4
+elseifndef NOIPV6
+       $(BIG_CA_CMD):= $@ -6
 endif
 
+$(BIG_CA_URL): $(BIG_CA_DIR)
+       $(BIG_CA_CMD) $@ $^
+
+big-ca-list: $(BIG_CA_URL)
+
+#$(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+dual: $(DOMAINS_DUAL)
+
 $(DOMAINS_IPV4):
 ifndef NOIPV4
        $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)