Updated: blacklist_sources, fqdn_filter. Minor fixes.

ruantiblock/files/etc/ruantiblock/fqdn_filter

@@ -82,3 +82,5 @@ birds
 forex
 kraken
 zerkalo
+^1w
+^1x

ruantiblock/files/etc/ruantiblock/gr_excluded_sld

@@ -17,3 +17,4 @@ duckdns.org
 dyndns.org
 dynsip.org
 mydns.jp
+mooo.com

ruantiblock/files/usr/bin/ruantiblock

@@ -72,6 +72,8 @@ export PKTS_MARK_START=8
 export ENABLE_LOGGING=1
 ### Вывод дополнительных сообщений в лог (0 - выкл, 1, 2)
 export DEBUG=0
+### Файл для вывода некоторых отладочных сообщений
+export DEBUG_FILE="/tmp/ruanliblock.debug"
 ### Html-страница с инфо о текущем статусе (0 - выкл, 1 - вкл) (не используется в OpenWrt)
 export ENABLE_HTML_INFO=0
 ### Максимальное кол-во элементов списка nftables
@@ -940,8 +942,22 @@ GetMainInstanceEntries() {
             if [ "$ENABLE_BLLIST_PROXY" = "1" ]; then
                 UpdateBllistProxySet " " "$BLLIST_HOSTS"
             fi
-            $BLLIST_MODULE
-            _return_code=$?
+
+            if [ $DEBUG -ge 1 ]; then
+                echo "  ruantiblock.GetMainInstanceEntries: BLLIST_MODULE=${BLLIST_MODULE} MODULE_RUN_TIMEOUT=${MODULE_RUN_TIMEOUT} _attempt=${_attempt}" >&2
+                MakeLogRecord "debug" "ruantiblock.GetMainInstanceEntries: BLLIST_MODULE=${BLLIST_MODULE} MODULE_RUN_TIMEOUT=${MODULE_RUN_TIMEOUT} _attempt=${_attempt}"
+
+                echo "BLLIST_MODULE=${BLLIST_MODULE}" > "$DEBUG_FILE"
+                $BLLIST_MODULE >> "$DEBUG_FILE" 2>&1
+                _return_code=$?
+
+                echo "  ruantiblock.GetMainInstanceEntries._return_code=${_return_code}" >&2
+                MakeLogRecord "debug" "ruantiblock.GetMainInstanceEntries._return_code=${_return_code}"
+            else
+                $BLLIST_MODULE
+                _return_code=$?
+            fi
+
             [ $_return_code -eq 0 ] && break
             ### STDOUT
             echo " Module run attempt ${_attempt}: failed [${BLLIST_MODULE}]" >&2

ruantiblock/files/usr/share/ruantiblock/blacklist_sources

@@ -5,7 +5,8 @@ export RBL_IP_URL="https://reestr.rublacklist.net/api/v3/ips/"
 export RBL_DPI_URL="https://reestr.rublacklist.net/api/v3/dpi/"
 export RBL_ENCODING=""
 ## zapret-info
-export ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv"
+export ZI_ALL_URL="https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-00.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-01.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-02.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-03.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-04.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-05.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-06.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-07.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-08.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-09.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-10.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-11.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-12.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-13.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-14.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-15.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-16.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-17.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-18.csv https://raw.githubusercontent.com/zapret-info/z-i/refs/heads/master/dump-19.csv"
+#export ZI_ALL_URL="https://app.assembla.com/spaces/z-i/git/source/master/dump.csv?_format=raw"
 export ZI_ENCODING="CP1251"
 ## antifilter
 export AF_IP_URL="https://antifilter.download/list/allyouneed.lst"