Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:02 01.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 2d27595ebf10084ea578c2881b3d5c445dc9c612..23c84935e418a089c8c821bdc5b64b729ef6059a 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/378/3715f820";
+:global CommitId "main/379/6c35fd4d";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:55:02 01.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:02 01.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;

diff --git a/html/certs/Makefile b/html/certs/Makefile
index 7ab8921f346239b084fa65c926da383521b8772f..7a4f4b61dae8d955e4034089ba78a6e97854404f 100644 (file)
--- a/html/certs/Makefile
+++ b/html/certs/Makefile
@@ -23,12 +23,13 @@ DOMAINS_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 \
-       9.9.9.9/DigiCert-Global-Root-CA \
        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-G2 \
+       mkcert.org/DigiCert-Global-Root-G3 \
+       mkcert.org/DigiCert-Trust-Root-G4 \
        mkcert.org/Starfield-Root-Certificate-Authority-G2 \
        ntfy.sh/ISRG-Root-X1 \
        www.dshield.org/GTS-Root-R4 \

diff --git a/html/mod/AM-AddCertsCustom.rsc b/html/mod/AM-AddCertsCustom.rsc
index 436f5170138b72249fb287c6b947afe1e2906951..ee09a3aac56da9840cc595035ea150ac42936558 100644 (file)
--- a/html/mod/AM-AddCertsCustom.rsc
+++ b/html/mod/AM-AddCertsCustom.rsc
@@ -19,15 +19,35 @@
 :global GlobalScriptsUrl;
 :local AmCertsUrl ($GlobalScriptsUrl . "certs/");
 :local arrAmCerts {
-    "DigiCertGlobalRootCA.crt.pem";
-    "DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem";
-    "DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem";
+    "ISRG-Root-X1.pem";
+    "ISRG-Root-X2.pem";
+    "Starfield-Root-Certificate-Authority-G2.pem";
     };
 
-$CertificateAvailable "Root YE" "fetch";
+# Letsencrypt R12 and R15 Urls to update certs for DoH servers issued by Let's Encrypt, e.g. CloudFlare and Quad9
+#:local arrAmCerts {
+#    "ISRG-Root-X1.pem";
+#    "ISRG-Root-X2.pem";
+#    "Starfield-Root-Certificate-Authority-G2.pem";
+#    }; 
+# Command to update certs from Common Name, e.g. "DigiCert Global Root CA"
+# Let's Encrypt Root CA R12 and R15 Urls:
+# https://letsencrypt.org/certs/isrgrootx1.pem
+# https://letsencrypt.org/certs/isrgrootx2.pem
+# https://letsencrypt.org/certs/starfieldroot-g2.pem
+#
+# Let's Encrypt CN=R12 and Subject Alt Name=DNS Urls to fetch is:
+# https://letsencrypt.org/gen-y/ISRG-Root-X1.pem
+
 
+# $CertificateAvailable "Root YE" "fetch";
+# Letsencrypt
+#https://letsencrypt.org/certs/gen-y/Root-YE.pem
 # Command to update certs from Common Name, e.g. "DigiCert Global Root CA"
-#/certificate/set name="Root-YE" [ find where common-name="Root YE" ];
+/certificate/set name="DigiCert-Global-Root-G3" [ find where common-name="DigiCert Global Root G3" ];
+/certificate/set name="DigiCert-Global-Root-CA" [ find where common-name="DigiCert Global Root CA" ];
+/certificate/set name="DigiCert-Global-G2-TLS-RSA-SHA256-CA1" [ find where common-name="DigiCert Global G2 TLS RSA SHA256 2020 CA1" ];
+/certificate/set name="DigiCert-Global-G3-TLS-ECC-SHA384-CA1" [ find where common-name="DigiCert Global G3 TLS ECC SHA384 2020 CA1" ];
 
 #google
 #:local CertName "GTS-Root-R1.pem";