ruantiblock-mod-lua, ruantiblock-mod-py: BLLIST_ORG_EXCLUDED, fqdn-only mode.

This commit is contained in:
gSpot
2025-11-13 18:14:06 +03:00
parent ba2f8ba558
commit ec26d291a3
14 changed files with 464 additions and 122 deletions
+30 -4
View File
@@ -14,14 +14,13 @@ al[ck]o
[cs]pravk
bets?
igr[ova]+
olimp
ol[iy]mp
p[o0]ker
leon
jackpot
spin
loto
bcity
stavka
lotery
fortuna
blackja
@@ -36,6 +35,8 @@ cash
market
kupit
drug
mefedron
narco
farma
apteka
drop
@@ -53,14 +54,15 @@ putan
intim
escort
feya
^1[-]?win
1[-]?win[-]
[.]win
#[.-]win
vegas
gamble
fishka
vavada
gold
avtomat
[.]win
pin[-]?up
stav[ko]
luck
@@ -84,3 +86,27 @@ kraken
zerkalo
^1w
^1x
pin[ck]o
^gamm?a[0-9-]
^zooma
^flagman[0-9-]
cactus[0-9-]
^stake[0-9-]
arkada[0-9-]
^selector[0-9-]
^7k[0-9-]
gizbo
^888
^monro[0-9-]
^martin[0-9-]
^kometa[0-9-]
^kush[0-9-]
clubnika
vodka
syka
shot[0-9-]
twin[0-9-]
irwin[c0-9-]
columbus
cryptoboss
#lord
@@ -18,3 +18,4 @@ dyndns.org
dynsip.org
mydns.jp
mooo.com
github.io
@@ -99,7 +99,7 @@ BLLIST_MODULE=""
### Настройки модулей-парсеров ###
### Режим обхода блокировок: ruantiblock-fqdn, ruantiblock-ip, zapret-info-fqdn, zapret-info-ip, rublacklist-fqdn, rublacklist-ip, antifilter-ip, fz-fqdn, fz-ip
### Режим обхода блокировок: ruantiblock-ip, ruantiblock-fqdn, ruantiblock-fqdn-only, zapret-info-ip, zapret-info-fqdn, zapret-info-fqdn-only, rublacklist-ip, rublacklist-fqdn, rublacklist-fqdn-only, antifilter-ip, antifilter-fqdn, antifilter-fqdn-only, fz-ip, fz-fqdn, fz-fqdn-only
BLLIST_PRESET=""
### В случае если из источника получено менее указанного кол-ва записей, то обновления списков не происходит
BLLIST_MIN_ENTRIES=3000
@@ -141,6 +141,10 @@ BLLIST_FQDN_FILTER_FILE="/etc/ruantiblock/fqdn_filter"
BLLIST_FQDN_EXCLUDED_ENABLE=0
### Файл с записями FQDN для опции BLLIST_FQDN_EXCLUDED_ENABLE
BLLIST_FQDN_EXCLUDED_FILE="/etc/ruantiblock/fqdn_excluded"
### Включение опции исключения записей определённых гос.органов из блэклиста
BLLIST_ORG_EXCLUDED_ENABLE=0
### Файл с записями для опции BLLIST_ORG_EXCLUDED_ENABLE
BLLIST_ORG_EXCLUDED_FILE="/etc/ruantiblock/org_excluded"
### Обрезка www[0-9]. в FQDN (0 - выкл, 1 - вкл)
BLLIST_STRIP_WWW=1
### Преобразование кириллических доменов в punycode (0 - выкл, 1 - вкл)
+5 -1
View File
@@ -135,7 +135,7 @@ export BLLIST_MODULE=""
##############################
### Режим обхода блокировок: ruantiblock-fqdn, ruantiblock-ip, zapret-info-fqdn, zapret-info-ip, rublacklist-fqdn, rublacklist-ip, antifilter-ip, fz-fqdn, fz-ip
### Режим обхода блокировок: ruantiblock-ip, ruantiblock-fqdn, zapret-info-ip, zapret-info-fqdn, zapret-info-fqdn-only, rublacklist-ip, rublacklist-fqdn, rublacklist-fqdn-only, antifilter-ip, antifilter-fqdn, antifilter-fqdn-only, fz-ip, fz-fqdn, fz-fqdn-only
export BLLIST_PRESET=""
### В случае если из источника получено менее указанного кол-ва записей, то обновления списков не происходит
export BLLIST_MIN_ENTRIES=3000
@@ -177,6 +177,10 @@ export BLLIST_FQDN_FILTER_FILE="${CONFIG_DIR}/fqdn_filter"
export BLLIST_FQDN_EXCLUDED_ENABLE=0
### Файл с записями FQDN для опции BLLIST_FQDN_EXCLUDED_ENABLE
export BLLIST_FQDN_EXCLUDED_FILE="${CONFIG_DIR}/fqdn_excluded"
### Включение опции исключения записей определённых гос.органов из блэклиста
export BLLIST_ORG_EXCLUDED_ENABLE=0
### Файл с записями для опции BLLIST_ORG_EXCLUDED_ENABLE
export BLLIST_ORG_EXCLUDED_FILE="${CONFIG_DIR}/org_excluded"
### Обрезка www[0-9]. в FQDN (0 - выкл, 1 - вкл)
export BLLIST_STRIP_WWW=1
### Преобразование кириллических доменов в punycode (0 - выкл, 1 - вкл)
@@ -6,10 +6,13 @@ 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/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://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-00.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-01.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-02.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-03.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-04.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-05.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-06.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-07.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-08.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-09.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-10.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-11.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-12.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-13.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-14.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-15.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-16.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-17.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-18.csv?format=raw https://sourceforge.net/p/zapret-info/code/HEAD/tree/dump-19.csv?format=raw"
#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"
export AF_IP_FULL_URL="https://antifilter.download/list/ipresolve.lst"
export AF_IP_URL="https://antifilter.download/list/ip.lst"
export AF_NET_URL="https://antifilter.download/list/subnet.lst"
export AF_FQDN_URL="https://antifilter.download/list/domains.lst"
export AF_ENCODING=""
## fz
@@ -21,13 +24,17 @@ case "$BLLIST_PRESET" in
zapret-info-ip)
### Источник для обновления списка блокировок (zapret-info, rublacklist, antifilter, fz, ruantiblock)
export BLLIST_SOURCE="zapret-info"
### Режим обхода блокировок: ip, fqdn
### Режим обхода блокировок: ip, fqdn, fqdn-only
export BLLIST_MODE="ip"
;;
zapret-info-fqdn)
export BLLIST_SOURCE="zapret-info"
export BLLIST_MODE="fqdn"
;;
zapret-info-fqdn-only)
export BLLIST_SOURCE="zapret-info"
export BLLIST_MODE="fqdn-only"
;;
rublacklist-ip)
export BLLIST_SOURCE="rublacklist"
export BLLIST_MODE="ip"
@@ -36,10 +43,22 @@ case "$BLLIST_PRESET" in
export BLLIST_SOURCE="rublacklist"
export BLLIST_MODE="fqdn"
;;
rublacklist-fqdn-only)
export BLLIST_SOURCE="rublacklist"
export BLLIST_MODE="fqdn-only"
;;
antifilter-ip)
export BLLIST_SOURCE="antifilter"
export BLLIST_MODE="ip"
;;
antifilter-fqdn)
export BLLIST_SOURCE="antifilter"
export BLLIST_MODE="fqdn"
;;
antifilter-fqdn-only)
export BLLIST_SOURCE="antifilter"
export BLLIST_MODE="fqdn-only"
;;
fz-ip)
export BLLIST_SOURCE="fz"
export BLLIST_MODE="ip"
@@ -48,6 +67,10 @@ case "$BLLIST_PRESET" in
export BLLIST_SOURCE="fz"
export BLLIST_MODE="fqdn"
;;
fz-fqdn-only)
export BLLIST_SOURCE="fz"
export BLLIST_MODE="fqdn-only"
;;
ruantiblock-ip)
export BLLIST_SOURCE="ruantiblock"
export BLLIST_MODE="ip"