]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:05:03 04.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 03:05:03 +0000 (06:05 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 03:05:03 +0000 (06:05 +0300)
html/AM-GlobalFunc.rsc
html/mod/AM-AddCertsCustom.rsc

index fb26ed342b04685252409f943c4e959f0eb9e244..8ac44626c43121bcca25ce98a06ea1f5a52e4f44 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/509/c2f4139d";
+:global CommitId "main/510/6bd315f8";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:00:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:05:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
index ee09a3aac56da9840cc595035ea150ac42936558..422f7ff1614169b23a7ed3cf2b6aa8bd4997c1f2 100644 (file)
@@ -17,7 +17,8 @@
 #/certificate/import file-name=DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem  passphrase="";
 
 :global GlobalScriptsUrl;
-:local AmCertsUrl ($GlobalScriptsUrl . "certs/");
+:global CertRenewUrl;
+:local CertsUrl ($GlobalScriptsUrl . "certs/");
 :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="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";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
-#:set CertName "GTS-Root-R4.pem";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
-#:set CertName "GTS-Root-RX.pem";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
-#internet
-#:set CertName "ISRG-Root-X1.pem";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
-#:set CertName "ISRG-Root-X2.pem";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
-#:set CertName "Starfield-Root-Certificate-Authority-G2.pem";
-#/tool/fetch mode=https url=($AmScriptsUrl . "certs/" . $CertName);
-#/certificate/import file-name=$CertName passphrase="";
+#/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" ];
 
 #/ip/dns/set allow-remote-requests=yes doh-max-concurrent-queries=100 doh-max-server-connections=20 use-doh-server=https://security.cloudflare-dns.com/dns-query verify-doh-cert=yes;
 #/ip/dns/static remove [find where address=1.1.1.1];