From 02c76a4fb60a2c0442d954aa23577b87850cc7c4 Mon Sep 17 00:00:00 2001 From: bol-van Date: Fri, 24 Jan 2025 11:39:13 +0300 Subject: [PATCH] ipset: return HUP reload --- ipset/def.sh | 12 ++++++++++++ ipset/get_antizapret_domains.sh | 2 ++ ipset/get_reestr_hostlist.sh | 2 ++ ipset/get_reestr_resolvable_domains.sh | 2 ++ ipset/get_refilter_domains.sh | 2 ++ 5 files changed, 20 insertions(+) diff --git a/ipset/def.sh b/ipset/def.sh index 078c097..aa55ca3 100644 --- a/ipset/def.sh +++ b/ipset/def.sh @@ -267,3 +267,15 @@ 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 1bbbdc4..12583a8 100755 --- a/ipset/get_antizapret_domains.sh +++ b/ipset/get_antizapret_domains.sh @@ -31,4 +31,6 @@ sort -u "$ZDOM" | zz "$ZHOSTLIST" rm -f "$ZDOM" +hup_zapret_daemons + exit 0 diff --git a/ipset/get_reestr_hostlist.sh b/ipset/get_reestr_hostlist.sh index 9c3ee95..0054cbc 100755 --- a/ipset/get_reestr_hostlist.sh +++ b/ipset/get_reestr_hostlist.sh @@ -58,6 +58,8 @@ 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 6785916..fa00869 100755 --- a/ipset/get_reestr_resolvable_domains.sh +++ b/ipset/get_reestr_resolvable_domains.sh @@ -34,6 +34,8 @@ 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 f329ad6..b11d26d 100755 --- a/ipset/get_refilter_domains.sh +++ b/ipset/get_refilter_domains.sh @@ -37,4 +37,6 @@ getipban || FAIL=1 dl "$URL" "$ZHOSTLIST" 32768 4194304 +hup_zapret_daemons + exit 0