From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 08:15:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:15:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=b82d8221c155d9f5e58fa0bcbadf4263e39765c6;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:15:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 029c9fa7a..da54effff 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -17,7 +17,9 @@ :local FwAddrListsUrl ($GlobalScriptsUrl . "fw-addr-lists.d/"); :local FwAddrListsIndexUrl ($FwAddrListsUrl . "index"); :local FwAddrListTimeOut 1d; - :local FetchMode ""; + :local CheckCerts true; + :local FetchMode "https-only"; + :local FetchMethod "get"; :global CertificateAvailable; :global EitherOr; @@ -134,7 +136,6 @@ :set Branch [ $GetBranch $Address ]; :if ([ :typeof ($IPv4Addresses->$Branch) ] != "array") do={ :set ($IPv4Addresses->$Branch) ({}) }; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; - :error true; } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ :local Net $Address; @@ -148,7 +149,6 @@ :set Branch [ $GetBranch $Address ]; :if ([ :typeof ($IPv6Addresses->$Branch) ] != "array") do={ :set ($IPv6Addresses->$Branch) ({}) }; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; - :error true; } :if ($Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={ :set Branch [ $GetBranch $Address ]; @@ -156,7 +156,6 @@ :if ([ :typeof ($IPv6Addresses->$Branch) ] != "array") do={ :set ($IPv6Addresses->$Branch) ({}) }; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; - :error true; } } on-error={:log error ($ScriptName . " Failed parsing address: " . $Line->0);} } @@ -196,7 +195,7 @@ } else={ :if ($Failure = false) do={ :log debug ($ScriptName . " Removing IPv6 address " . $Address . \ - " from list '" . $FwListName ."."); + " from list '" . $FwListName . "."); /ipv6/firewall/address-list/remove $Entry; :set CntRemove ($CntRemove + 1); } diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index d72e4c1f0..a183eaf21 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/546/6df1efd6"; +:global CommitId "main/547/9b892c49"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:10:03 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 11:15:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140;