]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:30:03 05.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 23:30:04 +0000 (02:30 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Mon, 4 May 2026 23:30:04 +0000 (02:30 +0300)
html/AM-GlobalFunc.rsc
html/mod/AM-Certs-By-Ident.rsc [new file with mode: 0644]
html/mod/Certs-Custom.rsc [deleted file]

index dd8d77dc5a85f65e1ae2b8394680fd0cd1b3cffd..e9686258e70f0fd5ebca9ab574034e76bf37e4da 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/621/f2c294bc";
+:global CommitId "main/622/083b52c4";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:25:03 05.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:30:03 05.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;
diff --git a/html/mod/AM-Certs-By-Ident.rsc b/html/mod/AM-Certs-By-Ident.rsc
new file mode 100644 (file)
index 0000000..32cd72c
--- /dev/null
@@ -0,0 +1,120 @@
+# CloudFlare
+#/tool/fetch mode=https url=https://cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem;
+#/certificate/import file-name=DigiCertGlobalRootCA.crt.pem passphrase="";
+#/tool/ fetch mode=https url=https://cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem;
+#/certificate/import file-name=DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem passphrase="";
+# Quad9
+#/tool/fetch mode=https url="https://cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem"
+#/certificate/import file-name=DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem  passphrase="";
+
+:global GlobalScriptsUrl;
+:local UrlSuffix [ /system /system identity get name ];
+:local UrlDir "certs/";
+:local CertUrl ($GlobalScriptsUrl . $UrlDir . $UrlSufiix ."/");
+#google
+:local CertName "DigiCert-Global-Root-CA.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Global-Root-CA" [ find where common-name="DigiCert Global Root CA" ];
+
+:set CertName "DigiCert-Assured-ID-Root-CA.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Assured-ID-Root-CA" [ find where common-name="DigiCert Assured ID Root CA" ];
+
+:set CertName "DigiCert-Assured-ID-Root-G2.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Assured-ID-Root-G2" [ find where common-name="DigiCert Assured ID Root G3" ];
+
+:set CertName "DigiCert-Assured-ID-Root-G3.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Assured-ID-Root-G3" [ find where common-name="DigiCert Assured ID Root G3" ];
+
+:set CertName "DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1" [ find where common-name="DigiCert Global G2 TLS RSA SHA256 2020 CA1" ];
+
+:set CertName "DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1" [ find where common-name="DigiCert Global G3 TLS ECC SHA384 2020 CA1" ];
+
+:set CertName "DigiCert-Global-Root-G2.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Global-Root-G2" [ find where common-name="DigiCert Global Root G2" ];
+
+:set CertName "DigiCert-Global-Root-G3.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Global-Root-G3" [ find where common-name="DigiCert Global Root G3" ];
+
+:set CertName "DigiCert-TLS-ECC-P384-Root-G5.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-TLS-ECC-P384-Root-G5" [ find where common-name="DigiCert TLS ECC P384 Root G5" ];
+
+:set CertName "DigiCert-TLS-RSA4096-Root-G5.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-TLS-RSA4096-Root-G5" [ find where common-name="DigiCert TLS RSA4096 Root G5" ];
+
+:set CertName "DigiCert-Trusted-Root-G4.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="DigiCert-Trusted-Root-G4" [ find where common-name="DigiCert Trusted Root G4" ];
+
+:set CertName "GTS-Root-R4.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="GTS-Root-R4" [ find where common-name="GTS Root R4" ];
+
+:set CertName "Go-Daddy-Root-Certificate-Authority-G2.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="Go-Daddy-Root-Certificate-Authority-G2" [ find where common-name="Go Daddy Root Certificate Authority - G2" ];
+
+:set CertName "ISRG-Root-X1.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="ISRG-Root-X1" [ find where common-name="ISRG Root X1" ];
+
+:set CertName "Root-YE.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="Root-YE" [ find where common-name="Root YE" ];
+
+:set CertName "Starfield-Root-Certificate-Authority-G2.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="Starfield-Root-Certificate-Authority-G2" [ find where common-name="Starfield Root Certificate Authority - G2" ];
+
+:set CertName "USERTrust-RSA-Certification-Authority.pem";
+/tool/fetch mode=https url=($CertUrl . $CertName);
+/certificate/import file-name=$CertName passphrase="";
+/certificate/set name="USERTrust-RSA-Certification-Authority" [ find where common-name="USERTrust RSA Certification Authority" ];
+
+#/certificate/import file-name=$CertName passphrase="";
+#/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
+#/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="";
+
+
+#/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];
+#/ip/dns/static add address=1.1.1.1 name=security.cloudflare-dns.com comment="cloudflare-dns IPv4 1";
+#/ip/dns/ static remove  [find where address=1.0.0.1];
+#/ip/dns/static add address=1.0.0.1 name=security.cloudflare-dns.com comment="cloudflare-dns IPv4 2"
+#/ip dns static add address=2606:4700:4700::1111 name=security.cloudflare-dns.com type=AAAA
+#/ip dns static add address=2606:4700:4700::1001 name=security.cloudflare-dns.com type=AAAA
+#/ip/dns set servers="1.0.0.1, 8.8.4.4";
+#/ip/dns set servers="";
\ No newline at end of file
diff --git a/html/mod/Certs-Custom.rsc b/html/mod/Certs-Custom.rsc
deleted file mode 100644 (file)
index e69de29..0000000