From 5f3773629d4e739434a76bdd6230cb35f29534ba Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 15 May 2026 11:45:04 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:45:03 15.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/AM-setup.rsc | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 3d05cb8fa..8ff09f933 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/644/32595ddd"; +:global CommitId "main/645/d89d834f"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:35:03 15.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:45:03 15.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; diff --git a/html/AM-setup.rsc b/html/AM-setup.rsc index 0471902e0..bdb465bf4 100644 --- a/html/AM-setup.rsc +++ b/html/AM-setup.rsc @@ -147,7 +147,7 @@ :put "Renaming AM-GlobalConfig, if exists..."; :local ConfOldName ("AM-GlobalConfig-" . [ /system/clock/get date ] . [ /system/clock/get time ] . ".rsc"); /system/script/set name=$ConfOldName [ find where name="AM-GlobalConfig" ]; - :foreach Script in={ "AM-GlobalConfig"; "AM-GlobalFunc"; "mod/AM-Certs-By-Ident" } do={ + :foreach Script in={ "AM-GlobalConfig"; "AM-GlobalFunc" } do={ :put "Installing $Script..."; /system/script/remove [ find where name=$Script ]; /system/script/add name=$Script owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl url=($GlobalScriptsUrl . $Script . ".rsc") output=user as-value ]->"data"); @@ -156,6 +156,18 @@ :delay 2s; }; + :local Script "mod/AM-Certs-By-Ident"; + + :put "Installing $Script..."; + /system/script/remove [ find where name=$Script ]; + /system/script/add name=$Script owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl url=($GlobalScriptsUrl . $Script . ".rsc") output=user as-value ]->"data"); + /system/script run $Script; + :global tmpAddCerts; + :while ([ $tmpAddCerts ] = true) do={ + :delay 1s; + } + /system/script/remove [ find where name=$Script ]; + :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] > 0) do={ :put "Renaming certificate by its common-name..."; :global CertificateNameByCN; -- 2.52.0