From ab32ad872bf39a38ea1f605ea96384704eae96d1 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Sun, 16 Aug 2026 22:40:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:40:03 16.08.2026. --- html/AM-GlobalFunc.rsc | 4 +- html/mod/.#AM-Certs-By-Ident.rsc | 1 - html/mod/AM-Certs-By-Ident.rsc | 190 +++++++++++++++++-------------- 3 files changed, 106 insertions(+), 89 deletions(-) delete mode 120000 html/mod/.#AM-Certs-By-Ident.rsc diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 1aa67ed42..93b2758c3 100644 --- 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/9077/11acfad8"; +:global CommitId "main/9078/ed627c42"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:35:04 16.08.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 22:40:03 16.08.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 deleted file mode 120000 index 31a9b668d..000000000 --- a/html/mod/.#AM-Certs-By-Ident.rsc +++ /dev/null @@ -1 +0,0 @@ -root@amster.1717677 \ No newline at end of file diff --git a/html/mod/AM-Certs-By-Ident.rsc b/html/mod/AM-Certs-By-Ident.rsc index 3a9097d20..2aa05a246 100644 --- a/html/mod/AM-Certs-By-Ident.rsc +++ b/html/mod/AM-Certs-By-Ident.rsc @@ -26,91 +26,109 @@ :log error $CertUrl; -: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" ]; - +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } +:do { + :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" ]; +} on-error={ } + :global tmpAddCerts (a); #/certificate/import file-name=$CertName passphrase=""; @@ -133,4 +151,4 @@ #/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 +#/ip/dns set servers=""; -- 2.52.0