From 33eda6b3fe31c6156480a9f2a098ecc5c01d49c8 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 08:35:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 08:35:02 04.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/AM-setup.rsc | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 875e69c6c..e06ff6278 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/528/a6273d14"; +:global CommitId "main/529/575f9924"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 08:20:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 08:35:02 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/AM-setup.rsc b/html/AM-setup.rsc index 3325f9062..fbbeecac5 100644 --- a/html/AM-setup.rsc +++ b/html/AM-setup.rsc @@ -37,7 +37,7 @@ :global RemoveMe; :global RunOnce; :global InitSetup true; -:global tmpfs true; +:global tmpfs false; { :local RmMe [:tobool $1]; @@ -62,19 +62,19 @@ :log warning ("\n\$GlobalScriptsUrl = " . $GlobalScriptsUrl); :local CertSettings [ /certificate/settings/get ]; - :if (!((($CertSettings->"builtin-trust-anchors") = "trusted" || \ + :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") && \ [ :len [ /certificate/builtin/find where common-name=$CertCommonName ] ] > 0)) do={ - :put "Importing certificate..."; - - /tool/fetch ($GlobalScriptsUrl . "certs/ipall/" . $CertFileName) dst-path=$CertFileName as-value; - :delay 1s; - /certificate/import file-name=$CertFileName passphrase=""; - :if ([ :len [ /certificate/find where fingerprint=$CertFingerprint ] ] != 1) do={ - :error "Something is wrong with your certificates!"; - }; - :delay 1s; + :put "Importing certificate..."; + /tool/fetch ($GlobalScriptsUrl . "certs/ipall/" . $CertFileName) dst-path=$CertFileName as-value; + :delay 1s; + /certificate/import file-name=$CertFileName passphrase=""; + :delay 1s; + }; }; :local MkTmpfs do={ -- 2.52.0