Autocommit in repo: ros.vados.ru, generated by owner: root, in 07:20:03 01.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 42df6d5fda0ba225344dd424b34652f14f214906..48700ef25adcddc6fde63e449c92239e7cf81ad6 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/353/35bb229e";
+:global CommitId "main/354/a01a9000";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:05:03 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 07:20:03 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/certs/Makefile b/html/certs/Makefile
index a4dc33cd6667778b85e6495c06d0accc439c72ca..c9a33798c22666ce2818976dc81c7ae9c6ad379d 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -7,9 +7,6 @@ CURL = curl \
        --silent
 
 DOMAINS_DUAL = \
-       cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem \
-       cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem \
-       cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem \
        api.macvendors.com/GTS-Root-R4 \
        api.telegram.org/Go-Daddy-Root-Certificate-Authority-G2 \
        cloudflare-dns.com/SSL-com-Root-Certification-Authority-ECC \
@@ -19,13 +16,10 @@ DOMAINS_DUAL = \
        gitlab.com/USERTrust-RSA-Certification-Authority \
        lists.blocklist.de/GTS-Root-R4 \
        matrix.org/GTS-Root-R4 \
-       raw.githubusercontent.com/USERTrust-RSA-Certification-Authority \
+       raw.githubusercontent.com/ISRG-Root-X1 \
        rsc.eworm.de/Root-YE \
        upgrade.mikrotik.com/ISRG-Root-X1
 DOMAINS_IPV4 = \
-       cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem \
-       cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem \
-       cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem \
        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 \

diff --git a/html/certs/Makefile.old b/html/certs/Makefile.old
new file mode 100644 (file)
index 0000000..a4dc33c
--- /dev/null
+++ b/html/certs/Makefile.old
@@ -0,0 +1,65 @@
+# Makefile to check certificates
+
+CURL = curl \
+       --capath /dev/null \
+       --connect-timeout 5 \
+       --output /dev/null \
+       --silent
+
+DOMAINS_DUAL = \
+       cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem \
+       cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem \
+       cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem \
+       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 \
+       git.eworm.de/Root-YE \
+       gitlab.com/USERTrust-RSA-Certification-Authority \
+       lists.blocklist.de/GTS-Root-R4 \
+       matrix.org/GTS-Root-R4 \
+       raw.githubusercontent.com/USERTrust-RSA-Certification-Authority \
+       rsc.eworm.de/Root-YE \
+       upgrade.mikrotik.com/ISRG-Root-X1
+DOMAINS_IPV4 = \
+       cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem \
+       cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem \
+       cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem \
+       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 \
+       ntfy.sh/ISRG-Root-X1 \
+       www.dshield.org/GTS-Root-R4 \
+       www.spamhaus.org/GTS-Root-R4
+DOMAINS_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
+
+.PHONY: $(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+
+all: $(DOMAINS_DUAL) $(DOMAINS_IPV4) $(DOMAINS_IPV6)
+
+$(DOMAINS_DUAL):
+ifndef NOIPV4
+       $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
+endif
+ifndef NOIPV6
+       $(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@)
+endif
+
+$(DOMAINS_IPV4):
+ifndef NOIPV4
+       $(CURL) -4 --cacert $(notdir $@).pem https://$(dir $@)
+endif
+
+$(DOMAINS_IPV6):
+ifndef NOIPV6
+       $(CURL) -6 --cacert $(notdir $@).pem https://$(dir $@)
+endif