From f2c294bcea93a579d3c1647f0e9a0ad7a8e4d299 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Tue, 5 May 2026 02:20:04 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:20:03 05.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/AM-setup.rsc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index f8009cd86..25e238a0f 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/619/a99e710a"; +:global CommitId "main/620/61c53edc"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 01:30:03 05.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 02:20:03 05.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; diff --git a/html/AM-setup.rsc b/html/AM-setup.rsc index fbbeecac5..fdcb9169d 100644 --- a/html/AM-setup.rsc +++ b/html/AM-setup.rsc @@ -60,11 +60,8 @@ } :log warning ("\n\$GlobalScriptsUrl = " . $GlobalScriptsUrl); - - :local CertSettings [ /certificate/settings/get ]; - :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] != 1) do={ - :error "Something is wrong with your certificates!"; - } else={ + + :if (!((($CertSettings->"builtin-trust-anchors") = "trusted" || \ ($CertSettings->"builtin-trust-store") ~ "fetch" || \ ($CertSettings->"builtin-trust-store") = "all") && \ @@ -75,6 +72,9 @@ /certificate/import file-name=$CertFileName passphrase=""; :delay 1s; }; + :local CertSettings [ /certificate/settings/get ]; + :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] != 1) do={ + :error "Something is wrong with your certificates!"; }; :local MkTmpfs do={ -- 2.52.0