From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Wed, 1 Apr 2026 02:30:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:03 01.04.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=f9f969d623fb61b45f3ce136f7ff540a2f7c6b6a;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:03 01.04.2026. --- diff --git a/html/.#AM-CheckCerts.rsc b/html/.#AM-CheckCerts.rsc deleted file mode 120000 index 14325530d..000000000 --- a/html/.#AM-CheckCerts.rsc +++ /dev/null @@ -1 +0,0 @@ -root@amster.4184617 \ No newline at end of file diff --git a/html/AM-CheckCerts.rsc b/html/AM-CheckCerts.rsc index 6ed82b447..78f5f9506 100644 --- a/html/AM-CheckCerts.rsc +++ b/html/AM-CheckCerts.rsc @@ -1,13 +1,12 @@ -#!rsc by RouterOS -# RouterOS script: check-certificates -# Copyright (c) 2013-2026 Christian Hesse -# https://rsc.eworm.de/COPYING.md +#!rsc by Vados +# RouterOS script: AM-CheckCerts +# Script comment: Check for certificates validity +# Copyright (c) 2005-2026 Vados +# # # requires RouterOS, version=7.19 # requires device-mode, fetch # -# check for certificate validity -# https://rsc.eworm.de/doc/check-certificates.md :local ExitOK false; :onerror Err { @@ -25,13 +24,12 @@ :global EscapeForRegEx; :global IfThenElse; :global LogPrint; - :global LogPrintOnce; :global ParseKeyValueStore; :global ScriptLock; :global SendNotification2; :global SymbolForNotification; :global UrlEncode; - :global WaitFullyConnected; +# :global WaitFullyConnected; :local CheckCertificatesDownloadImport do={ :local ScriptName [ :tostr $1 ]; @@ -162,7 +160,7 @@ :set ExitOK true; :error false; } - $WaitFullyConnected; +# $WaitFullyConnected; :foreach Cert in=[ /certificate/find where !revoked !ca !scep-url expires-after<$CertRenewTime ] do={ :local CertVal [ /certificate/get $Cert ]; @@ -171,7 +169,7 @@ :do { :if ([ :len $CertRenewUrl ] = 0) do={ - $LogPrintOnce info $ScriptName ("No CertRenewUrl given."); + $LogPrint info $ScriptName ("No CertRenewUrl given."); :error false; } $LogPrint info $ScriptName ("Attempting to renew certificate '" . ($CertVal->"name") . "'."); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index bbfc28e97..6b031c21f 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/203/0fd482ff"; +:global CommitId "main/204/e3bdf105"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:25:02 01.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:03 01.04.2026."; # The variables are received right here. :global GlobalConfVersion 138;