From 9d43dfdc71b7f29217dfd9b8750ae52b7d106e72 Mon Sep 17 00:00:00 2001 From: bol-van Date: Tue, 29 Oct 2024 19:02:07 +0300 Subject: [PATCH] ipset: remove hup --- ipset/def.sh | 13 ------------- ipset/get_antizapret_domains.sh | 2 -- ipset/get_exclude.sh | 2 -- ipset/get_ipban.sh | 2 -- ipset/get_reestr_hostlist.sh | 2 -- ipset/get_reestr_resolvable_domains.sh | 2 -- ipset/get_refilter_domains.sh | 2 -- 7 files changed, 25 deletions(-) diff --git a/ipset/def.sh b/ipset/def.sh index 174cc35..4d8b7c1 100644 --- a/ipset/def.sh +++ b/ipset/def.sh @@ -255,16 +255,3 @@ getipban() _get_ipban return 0 } - -hup_zapret_daemons() -{ - echo forcing zapret daemons to reload their hostlist - if exists killall; then - killall -HUP tpws nfqws dvtws 2>/dev/null - elif exists pkill; then - pkill -HUP ^tpws$ ^nfqws$ ^dvtws$ - else - echo no mass killer available ! cant HUP zapret daemons - fi -} - diff --git a/ipset/get_antizapret_domains.sh b/ipset/get_antizapret_domains.sh index 93848ac..1561257 100755 --- a/ipset/get_antizapret_domains.sh +++ b/ipset/get_antizapret_domains.sh @@ -31,6 +31,4 @@ sort -u "$ZDOM" | zz "$ZHOSTLIST" rm -f "$ZDOM" -hup_zapret_daemons - exit 0 diff --git a/ipset/get_exclude.sh b/ipset/get_exclude.sh index adaf8d6..ab5dd38 100755 --- a/ipset/get_exclude.sh +++ b/ipset/get_exclude.sh @@ -9,5 +9,3 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" getexclude "$IPSET_DIR/create_ipset.sh" - -[ "$MODE_FILTER" = hostlist ] && hup_zapret_daemons diff --git a/ipset/get_ipban.sh b/ipset/get_ipban.sh index 2bda981..825f342 100755 --- a/ipset/get_ipban.sh +++ b/ipset/get_ipban.sh @@ -9,5 +9,3 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" getipban "$IPSET_DIR/create_ipset.sh" - -[ "$MODE_FILTER" = hostlist ] && hup_zapret_daemons diff --git a/ipset/get_reestr_hostlist.sh b/ipset/get_reestr_hostlist.sh index 6691268..2c7450d 100755 --- a/ipset/get_reestr_hostlist.sh +++ b/ipset/get_reestr_hostlist.sh @@ -58,8 +58,6 @@ rm -f "$ZREESTR" [ "$DISABLE_IPV6" != "1" ] && $AWK '/^([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4}($|(\/[0-9]{2,3}$))/' "$IPB" | cut_local6 | ip2net6 | zz "$ZIPLIST_IPBAN6" rm -f "$IPB" -hup_zapret_daemons - ipban_fin exit 0 diff --git a/ipset/get_reestr_resolvable_domains.sh b/ipset/get_reestr_resolvable_domains.sh index d2defdc..3a213ff 100755 --- a/ipset/get_reestr_resolvable_domains.sh +++ b/ipset/get_reestr_resolvable_domains.sh @@ -34,8 +34,6 @@ dl() dl "$URL" "$ZHOSTLIST" 65536 67108864 -hup_zapret_daemons - [ "$DISABLE_IPV4" != "1" ] && dl "$IPB4" "$ZIPLIST_IPBAN" 8192 1048576 [ "$DISABLE_IPV6" != "1" ] && dl "$IPB6" "$ZIPLIST_IPBAN6" 128 1048576 diff --git a/ipset/get_refilter_domains.sh b/ipset/get_refilter_domains.sh index ed40738..88cb7fd 100755 --- a/ipset/get_refilter_domains.sh +++ b/ipset/get_refilter_domains.sh @@ -37,6 +37,4 @@ getipban || FAIL=1 dl "$URL" "$ZHOSTLIST" 32768 4194304 -hup_zapret_daemons - exit 0