Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:45:03 15.05.2026.

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 3d05cb8fa46c01ede0be3a6f0e48eb40a71a7885..8ff09f933e1ccbd801cdf4a4f48d6852e385702e 100644 (file)
--- 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 0471902e0ac24c351f3ead31ab6d8db3c785dc64..bdb465bf4c432f67e93bbe91c62c2f7b447b194e 100644 (file)
--- a/html/AM-setup.rsc
+++ b/html/AM-setup.rsc
@@ -147,7 +147,7 @@
   :put "Renaming AM-GlobalConfig, if exists...";\r
   :local ConfOldName ("AM-GlobalConfig-" . [ /system/clock/get date ] . [ /system/clock/get time ] . ".rsc");\r
   /system/script/set name=$ConfOldName [ find where name="AM-GlobalConfig" ];\r
-  :foreach Script in={ "AM-GlobalConfig"; "AM-GlobalFunc"; "mod/AM-Certs-By-Ident" } do={\r
+  :foreach Script in={ "AM-GlobalConfig"; "AM-GlobalFunc" } do={\r
     :put "Installing $Script...";\r
     /system/script/remove [ find where name=$Script ];\r
     /system/script/add name=$Script owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl url=($GlobalScriptsUrl . $Script . ".rsc")  output=user as-value ]->"data");\r
@@ -156,6 +156,18 @@
     :delay 2s;\r
   };\r
 \r
+  :local Script "mod/AM-Certs-By-Ident";\r
+  \r
+  :put "Installing $Script...";\r
+  /system/script/remove [ find where name=$Script ];\r
+  /system/script/add name=$Script owner=$Script source=([ /tool/fetch check-certificate=yes-without-crl url=($GlobalScriptsUrl . $Script . ".rsc")  output=user as-value ]->"data");\r
+  /system/script run $Script;\r
+  :global tmpAddCerts;\r
+  :while ([ $tmpAddCerts ] = true) do={\r
+    :delay 1s;\r
+  }\r
+  /system/script/remove [ find where name=$Script ];\r
+\r
   :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] > 0) do={\r
     :put "Renaming certificate by its common-name...";\r
     :global CertificateNameByCN;\r