Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:45:02 04.05.2026.

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index 5235fe375d473eddbdb3bd81c7cb1d64e7cec94f..e239838f1fddeb38128b05b5b12d1c702d45df2a 100644 (file)
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -14,8 +14,9 @@
   :local ScriptName [ :jobname ];
 
   :global GlobalScriptsUrl;
-  :local FwAddrListsUrl ($GlobalScriptsUrl . "fw-addr-lists.d/");
-  :local FwAddrListsIndexUrl ($FwAddrListsUrl . "index");
+  :local FwAddrListsDirName ("fw-addr-lists.d/" . [/system/identity/get name] "/");
+  :local FwAddrListsUrl ($GlobalScriptsUrl . $FwAddrListsDirName);
+  :local Index "index.lst";
   :local FwAddrListTimeOut 1d;
   :local CheckCerts false;
   :local FetchMode "https-only";
@@ -58,23 +59,24 @@
   }
 
   :local ListComment ("managed by " . $ScriptName);
-  :local FwAddrListsIndex false;
+  :local tmpIndex false;
+  :local IndexUrl ($FwAddrListsUrl . $Index);
 
   :for I from=1 to=5 do={
-    :if ($FwAddrListsIndex = false) do={
-      :set FwAddrListsIndex [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsIndexUrl $CheckCerts ] ];
-      :if ($FwAddrListsIndex = false && $I < 5) do={
-        :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $FwAddrListsIndexUrl);
+    :if ($tmpIndex = false) do={
+      :set tmpIndex [ :tolf [ $FetchLargeFiles $ScriptName $IndexUrl $CheckCerts ] ];
+      :if ($tmpIndex = false && $I < 5) do={
+        :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $IndexUrl);
         :delay (($I * $I) . "s");
       }
     }
   }
-  :if ($FwAddrListsIndex = false) do={
-    :log warning ($ScriptName . " Failed downloading address-list index from: " . $FwAddrListsIndexUrl);
-    :set FwAddrListsIndex "";
+  :if ($tmpIndex = false) do={
+    :log warning ($ScriptName . " Failed downloading address-list index from: " . $IndexUrl);
+    :set tmpIndex "";
   }
 
-  :foreach FwListFile in=[ :deserialize $FwAddrListsIndex delimiter="\n" from=dsv options=dsv.plain ] do={
+  :foreach FwListFile in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
     :local FwListName ($FwListFile->0);
     :local Delim [ $FindDelim $FwListName ];
     :if ($Delim = 0) do={ :set FwListName ""; };

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 944197961e2e5f877c30bb64885aee81672f789f..0431577244f12e0630c37375d93a4b511646e971 100644 (file)
--- 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/554/f4442323";
+:global CommitId "main/555/40c9fb70";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:20:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:45:02 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;

diff --git a/html/fw-addr-lists.d/FuckRKN b/html/fw-addr-lists.d/MikroMaster/FuckRKN
similarity index 100%
rename from html/fw-addr-lists.d/FuckRKN
rename to html/fw-addr-lists.d/MikroMaster/FuckRKN

diff --git a/html/fw-addr-lists.d/allow b/html/fw-addr-lists.d/MikroMaster/allow
similarity index 100%
rename from html/fw-addr-lists.d/allow
rename to html/fw-addr-lists.d/MikroMaster/allow

diff --git a/html/fw-addr-lists.d/block b/html/fw-addr-lists.d/MikroMaster/block
similarity index 100%
rename from html/fw-addr-lists.d/block
rename to html/fw-addr-lists.d/MikroMaster/block

diff --git a/html/fw-addr-lists.d/index b/html/fw-addr-lists.d/MikroMaster/index
similarity index 100%
rename from html/fw-addr-lists.d/index
rename to html/fw-addr-lists.d/MikroMaster/index

diff --git a/html/fw-addr-lists.d/mikrotik b/html/fw-addr-lists.d/MikroMaster/mikrotik
similarity index 100%
rename from html/fw-addr-lists.d/mikrotik
rename to html/fw-addr-lists.d/MikroMaster/mikrotik