From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 1 May 2026 11:10:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:10:03 01.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=a501c1479bb283126af0a873708500b0f623ee41;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:10:03 01.05.2026. --- diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index c1b78fb3b..e359070a9 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/382/15a2331d"; +:global CommitId "main/384/9e8867c7"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 13:40:03 01.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:10:03 01.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; @@ -655,19 +655,18 @@ :log error ($0 . " Required certificate is not available."); :return false; } - :local MkCertString ("/tool/fetch check-certificate=yes-without-crl http-header-field=" . ({ [ $FetchUserAgentStr $0 ] }) . "\"https://mkcert.org/generate/\" http-data=" . [ :serialize to=json ({ $CommonName }) ] . " dst-path=$FileName as-value"); - :log debug ($0 . " Fetching certificate from mkcert.org with command: " . $MkCertString); + :put [ :toarr ("/tool/fetch check-certificate=yes-without-crl http-header-field=" . ({ [ $FetchUserAgentStr $0 ] }) . "\"https://mkcert.org/generate/\" http-data=" . [ :serialize to=json ({ $CommonName }) ] . " dst-path=$FileName as-value") ]; $WaitForFile $FileName; :if ([ /file/get $FileName size ] = 0) do={ $RmFile $FileName; :error false; } } on-error={ - :log warning ($0 . " Failed downloading certificate with CommonName '" . $CommonName . "'!"); + :log error ($0 . " Failed downloading certificate with CommonName '" . $CommonName . "'!"); :return false; } } - /certificate/import file-name=$FileName passphrase="" as-value; + #/certificate/import file-name=$FileName passphrase="" as-value; :delay 1s; $RmFile $FileName; :if ([ :len [ /certificate/find where common-name=$CommonName ] ] = 0) do={