]> Git [git.vados.ru] :: Repos - Mikrotiks/ros.vados.ru.git/commitdiff
Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:50:03 04.05.2026.
authorvados-dev <192440777+vados-dev@users.noreply.github.com>
Sun, 3 May 2026 22:50:03 +0000 (01:50 +0300)
committervados-dev <192440777+vados-dev@users.noreply.github.com>
Sun, 3 May 2026 22:50:03 +0000 (01:50 +0300)
22 files changed:
html/AM-GlobalConfig.rsc
html/AM-GlobalFunc.rsc
html/certs/Master/.index.tsv [deleted file]
html/certs/MikroMaster/.index.tsv [new file with mode: 0644]
html/certs/MikroMaster/DigiCert-Assured-ID-Root-CA.pem [moved from html/certs/Master/DigiCert-Assured-ID-Root-CA.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Assured-ID-Root-G2.pem [moved from html/certs/Master/DigiCert-Assured-ID-Root-G2.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Assured-ID-Root-G3.pem [moved from html/certs/Master/DigiCert-Assured-ID-Root-G3.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem [moved from html/certs/Master/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1.pem [moved from html/certs/Master/DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Global-Root-CA.pem [moved from html/certs/Master/DigiCert-Global-Root-CA.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Global-Root-G2.pem [moved from html/certs/Master/DigiCert-Global-Root-G2.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Global-Root-G3.pem [moved from html/certs/Master/DigiCert-Global-Root-G3.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-TLS-ECC-P384-Root-G5.pem [moved from html/certs/Master/DigiCert-TLS-ECC-P384-Root-G5.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-TLS-RSA4096-Root-G5.pem [moved from html/certs/Master/DigiCert-TLS-RSA4096-Root-G5.pem with 100% similarity]
html/certs/MikroMaster/DigiCert-Trusted-Root-G4.pem [moved from html/certs/Master/DigiCert-Trusted-Root-G4.pem with 100% similarity]
html/certs/MikroMaster/GTS-Root-R4.pem [moved from html/certs/Master/GTS-Root-R4.pem with 100% similarity]
html/certs/MikroMaster/Go-Daddy-Root-Certificate-Authority-G2.pem [moved from html/certs/Master/Go-Daddy-Root-Certificate-Authority-G2.pem with 100% similarity]
html/certs/MikroMaster/ISRG-Root-X1.pem [moved from html/certs/Master/ISRG-Root-X1.pem with 100% similarity]
html/certs/MikroMaster/Root-YE.pem [moved from html/certs/Master/Root-YE.pem with 100% similarity]
html/certs/MikroMaster/Starfield-Root-Certificate-Authority-G2.pem [moved from html/certs/Master/Starfield-Root-Certificate-Authority-G2.pem with 100% similarity]
html/certs/MikroMaster/USERTrust-RSA-Certification-Authority.pem [moved from html/certs/Master/USERTrust-RSA-Certification-Authority.pem with 100% similarity]
html/certs/lists/Makefile.MikroMaster [moved from html/certs/lists/Makefile.Master with 100% similarity]

index 3ef76b5ab34723590fdc678075933d75724a7dbf..aadf5de4298428fc5a6b6b26fd178861e8aaaef6 100644 (file)
@@ -5,6 +5,7 @@
 #
 #
 # Warning: Dont touch this line!
+:global Identity [ /system identity get name ];
 :global GlobalConfReady false;
 #
 #
@@ -66,7 +67,7 @@
 ## Update channel. Possible values: stable, long-term, testing, development
 :global updateChannel "stable";
 
-:global CertRenewUrl ($GlobalScriptsUrl . "certs/");
+:global CertRenewUrl ($GlobalScriptsUrl . "certs/" . $Identity . "/");
 :global CertRenewTime 2w;
 :global CertRenewPass {
   "";
index 9c471443e1560b0890975d62a72b075dbf60f54b..b9e3f106b6e2cbd2023090727a39e8663c1d6d78 100644 (file)
@@ -17,9 +17,9 @@
 :global GlobalFuncReady false;
 
 # Git commit id & info, expected configuration version
-:global CommitId "main/474/01661bd4";
+:global CommitId "main/475/79a36e0f";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:45:02 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:50:03 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 138;
diff --git a/html/certs/Master/.index.tsv b/html/certs/Master/.index.tsv
deleted file mode 100644 (file)
index 172bbba..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-https://api.macvendors.com/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/Master/GTS-Root-R4.pem GTS Root R4
-https://api.telegram.org/      https://certs.godaddy.com/repository/gdroot-g2.crt      /var/www/ros.vados.ru/html/certs/Master/Go-Daddy-Root-Certificate-Authority-G2.pem      Go Daddy Root Certificate Authority - G2
-https://cacerts.digicert.com/  https://cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem      /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem  DigiCert Global G2 TLS RSA SHA256 2020 CA1
-https://cacerts.digicert.com/  https://cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem      /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1.pem  DigiCert Global G3 TLS ECC SHA384 2020 CA1
-https://dns.google/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/Master/GTS-Root-R4.pem GTS Root R4
-https://dns.quad9.net/ ca-list/DigiCert-Global-Root-G3.pem     /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-Root-G3.pem     DigiCert Global Root G3
-https://gitlab.com/    ca-list/USERTrust-RSA-Certification-Authority.pem       /var/www/ros.vados.ru/html/certs/Master/USERTrust-RSA-Certification-Authority.pem       USERTrust RSA Certification Authority
-https://lists.blocklist.de/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/Master/GTS-Root-R4.pem GTS Root R4
-https://matrix.org/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/Master/GTS-Root-R4.pem GTS Root R4
-https://raw.githubusercontent.com/     ca-list/ISRG-Root-X1.pem        /var/www/ros.vados.ru/html/certs/Master/ISRG-Root-X1.pem        ISRG Root X1
-https://upgrade.mikrotik.com/  ca-list/ISRG-Root-X1.pem        /var/www/ros.vados.ru/html/certs/Master/ISRG-Root-X1.pem        ISRG Root X1
-https://letsencrypt.org/       https://letsencrypt.org/certs/gen-y/root-ye.pem /var/www/ros.vados.ru/html/certs/Master/Root-YE.pem     Root YE
-https://ipv4.tunnelbroker.net/ ca-list/Starfield-Root-Certificate-Authority-G2.pem     /var/www/ros.vados.ru/html/certs/Master/Starfield-Root-Certificate-Authority-G2.pem     Starfield Root Certificate Authority - G2
-https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-CA.pem /var/www/ros.vados.ru/html/certs/Master/DigiCert-Assured-ID-Root-CA.pem DigiCert Assured ID Root CA
-https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-G2.pem /var/www/ros.vados.ru/html/certs/Master/DigiCert-Assured-ID-Root-G2.pem DigiCert Assured ID Root G2
-https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-G3.pem /var/www/ros.vados.ru/html/certs/Master/DigiCert-Assured-ID-Root-G3.pem DigiCert Assured ID Root G3
-https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-G2.pem     /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-Root-G2.pem     DigiCert Global Root G2
-https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-G3.pem     /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-Root-G3.pem     DigiCert Global Root G3
-https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-CA.pem     /var/www/ros.vados.ru/html/certs/Master/DigiCert-Global-Root-CA.pem     DigiCert Global Root CA
-https://cacerts.digicert.com/  ca-list/DigiCert-TLS-ECC-P384-Root-G5.pem       /var/www/ros.vados.ru/html/certs/Master/DigiCert-TLS-ECC-P384-Root-G5.pem       DigiCert TLS ECC P384 Root G5
-https://cacerts.digicert.com/  ca-list/DigiCert-TLS-RSA4096-Root-G5.pem        /var/www/ros.vados.ru/html/certs/Master/DigiCert-TLS-RSA4096-Root-G5.pem        DigiCert TLS RSA4096 Root G5
-https://cacerts.digicert.com/  ca-list/DigiCert-Trusted-Root-G4.pem    /var/www/ros.vados.ru/html/certs/Master/DigiCert-Trusted-Root-G4.pem    DigiCert Trusted Root G4
diff --git a/html/certs/MikroMaster/.index.tsv b/html/certs/MikroMaster/.index.tsv
new file mode 100644 (file)
index 0000000..a9fd932
--- /dev/null
@@ -0,0 +1,22 @@
+https://api.macvendors.com/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/MikroMaster/GTS-Root-R4.pem    GTS Root R4
+https://api.telegram.org/      https://certs.godaddy.com/repository/gdroot-g2.crt      /var/www/ros.vados.ru/html/certs/MikroMaster/Go-Daddy-Root-Certificate-Authority-G2.pem Go Daddy Root Certificate Authority - G2
+https://cacerts.digicert.com/  https://cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem      /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-G2-TLS-RSA-SHA256-2020-CA1.pem     DigiCert Global G2 TLS RSA SHA256 2020 CA1
+https://cacerts.digicert.com/  https://cacerts.digicert.com/DigiCertGlobalG3TLSECCSHA3842020CA1-1.crt.pem      /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-G3-TLS-ECC-SHA384-2020-CA1.pem     DigiCert Global G3 TLS ECC SHA384 2020 CA1
+https://dns.google/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/MikroMaster/GTS-Root-R4.pem    GTS Root R4
+https://dns.quad9.net/ ca-list/DigiCert-Global-Root-G3.pem     /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-Root-G3.pem        DigiCert Global Root G3
+https://gitlab.com/    ca-list/USERTrust-RSA-Certification-Authority.pem       /var/www/ros.vados.ru/html/certs/MikroMaster/USERTrust-RSA-Certification-Authority.pem  USERTrust RSA Certification Authority
+https://lists.blocklist.de/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/MikroMaster/GTS-Root-R4.pem    GTS Root R4
+https://matrix.org/    ca-list/GTS-Root-R4.pem /var/www/ros.vados.ru/html/certs/MikroMaster/GTS-Root-R4.pem    GTS Root R4
+https://raw.githubusercontent.com/     ca-list/ISRG-Root-X1.pem        /var/www/ros.vados.ru/html/certs/MikroMaster/ISRG-Root-X1.pem   ISRG Root X1
+https://upgrade.mikrotik.com/  ca-list/ISRG-Root-X1.pem        /var/www/ros.vados.ru/html/certs/MikroMaster/ISRG-Root-X1.pem   ISRG Root X1
+https://letsencrypt.org/       https://letsencrypt.org/certs/gen-y/root-ye.pem /var/www/ros.vados.ru/html/certs/MikroMaster/Root-YE.pem        Root YE
+https://ipv4.tunnelbroker.net/ ca-list/Starfield-Root-Certificate-Authority-G2.pem     /var/www/ros.vados.ru/html/certs/MikroMaster/Starfield-Root-Certificate-Authority-G2.pem        Starfield Root Certificate Authority - G2
+https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-CA.pem /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Assured-ID-Root-CA.pem    DigiCert Assured ID Root CA
+https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-G2.pem /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Assured-ID-Root-G2.pem    DigiCert Assured ID Root G2
+https://cacerts.digicert.com/  ca-list/DigiCert-Assured-ID-Root-G3.pem /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Assured-ID-Root-G3.pem    DigiCert Assured ID Root G3
+https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-G2.pem     /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-Root-G2.pem        DigiCert Global Root G2
+https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-G3.pem     /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-Root-G3.pem        DigiCert Global Root G3
+https://cacerts.digicert.com/  ca-list/DigiCert-Global-Root-CA.pem     /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Global-Root-CA.pem        DigiCert Global Root CA
+https://cacerts.digicert.com/  ca-list/DigiCert-TLS-ECC-P384-Root-G5.pem       /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-TLS-ECC-P384-Root-G5.pem  DigiCert TLS ECC P384 Root G5
+https://cacerts.digicert.com/  ca-list/DigiCert-TLS-RSA4096-Root-G5.pem        /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-TLS-RSA4096-Root-G5.pem   DigiCert TLS RSA4096 Root G5
+https://cacerts.digicert.com/  ca-list/DigiCert-Trusted-Root-G4.pem    /var/www/ros.vados.ru/html/certs/MikroMaster/DigiCert-Trusted-Root-G4.pem       DigiCert Trusted Root G4