mirror of
https://github.com/bol-van/zapret.git
synced 2024-11-26 04:00:53 +03:00
ipset: remove hup
This commit is contained in:
parent
b176af43a4
commit
9d43dfdc71
13
ipset/def.sh
13
ipset/def.sh
@ -255,16 +255,3 @@ getipban()
|
|||||||
_get_ipban
|
_get_ipban
|
||||||
return 0
|
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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -31,6 +31,4 @@ sort -u "$ZDOM" | zz "$ZHOSTLIST"
|
|||||||
|
|
||||||
rm -f "$ZDOM"
|
rm -f "$ZDOM"
|
||||||
|
|
||||||
hup_zapret_daemons
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -9,5 +9,3 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)"
|
|||||||
getexclude
|
getexclude
|
||||||
|
|
||||||
"$IPSET_DIR/create_ipset.sh"
|
"$IPSET_DIR/create_ipset.sh"
|
||||||
|
|
||||||
[ "$MODE_FILTER" = hostlist ] && hup_zapret_daemons
|
|
||||||
|
@ -9,5 +9,3 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)"
|
|||||||
getipban
|
getipban
|
||||||
|
|
||||||
"$IPSET_DIR/create_ipset.sh"
|
"$IPSET_DIR/create_ipset.sh"
|
||||||
|
|
||||||
[ "$MODE_FILTER" = hostlist ] && hup_zapret_daemons
|
|
||||||
|
@ -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"
|
[ "$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"
|
rm -f "$IPB"
|
||||||
|
|
||||||
hup_zapret_daemons
|
|
||||||
|
|
||||||
ipban_fin
|
ipban_fin
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -34,8 +34,6 @@ dl()
|
|||||||
|
|
||||||
dl "$URL" "$ZHOSTLIST" 65536 67108864
|
dl "$URL" "$ZHOSTLIST" 65536 67108864
|
||||||
|
|
||||||
hup_zapret_daemons
|
|
||||||
|
|
||||||
[ "$DISABLE_IPV4" != "1" ] && dl "$IPB4" "$ZIPLIST_IPBAN" 8192 1048576
|
[ "$DISABLE_IPV4" != "1" ] && dl "$IPB4" "$ZIPLIST_IPBAN" 8192 1048576
|
||||||
[ "$DISABLE_IPV6" != "1" ] && dl "$IPB6" "$ZIPLIST_IPBAN6" 128 1048576
|
[ "$DISABLE_IPV6" != "1" ] && dl "$IPB6" "$ZIPLIST_IPBAN6" 128 1048576
|
||||||
|
|
||||||
|
@ -37,6 +37,4 @@ getipban || FAIL=1
|
|||||||
|
|
||||||
dl "$URL" "$ZHOSTLIST" 32768 4194304
|
dl "$URL" "$ZHOSTLIST" 32768 4194304
|
||||||
|
|
||||||
hup_zapret_daemons
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
Loading…
Reference in New Issue
Block a user