From 618247ec43af799ac8cd7d82b7c4c7f45145682a Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 1 May 2026 05:30:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:02 01.05.2026. --- html/AM-FwAddrLists.rsc | 35 +++++++++++++++++++++++++++++++++-- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index ed7715df0..22674c8f9 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -13,8 +13,39 @@ do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50; :local ScriptName [ :jobname ]; - :global FwAddrLists; - :global FwAddrListTimeOut; + :global GlobalScriptsUrl; + :local FwAddrListsUrl ($GlobalScriptsUrl . "fw-addr-lists.d/"); + + :local FwAddrLists { + "allow"={ + { url=($FwAddrListsUrl . "allow"); + cert="Root YE"; timeout=1w }; + }; + "block"={ + { url=($FwAddrListsUrl . "block"); + cert="Root YE" }; +# { url="https://raw.githubusercontent.com/stamparm/ipsum/refs/heads/master/levels/4.txt"; +# # higher level (decrease the numerical value) for more addresses, and vice versa +# cert="ISRG Root X1" }; +# { url="https://www.dshield.org/block.txt"; cidr="/24"; +# cert="GTS Root R4" }; +# { url="https://lists.blocklist.de/lists/strongips.txt"; +# cert="GTS Root R4" }; +# { url="https://www.spamhaus.org/drop/drop_v4.json"; +# cert="GTS Root R4" }; +# { url="https://www.spamhaus.org/drop/drop_v6.json"; +# cert="GTS Root R4" }; + }; + "mikrotik"={ + { url=($FwAddrListsUrl . "mikrotik"); + cert="Root YE"; timeout=1w }; + }; + "FuckRKN"={ + { url=($FwAddrListsUrl . "FuckRKN"); + cert="Root YE"; timeout=1w }; + }; + }; + :local FwAddrListTimeOut 1d; :global CertificateAvailable; :global EitherOr; diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 635451e6a..8c0732fb4 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/348/e201dbb4"; +:global CommitId "main/349/7cf2b376"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 04:50:02 01.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:30:02 01.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0