init.d,ipset: ability to specify custom binaries location

This commit is contained in:
bol-van
2021-10-31 10:19:20 +03:00
parent 2d9ba2fe82
commit fe7cfad797
5 changed files with 10 additions and 10 deletions

View File

@@ -63,9 +63,9 @@ ipset_restore()
# do not saveram small files. file can also be gzipped
[ "$SAVERAM" = "1" ] && [ "$fsize" -ge "$IPSET_SAVERAM_MIN_FILESIZE" ] && svram=1
local T="Adding to ipset $2 ($IPSTYPE"
[ "$svram" = "1" ] && T="$T, saveram"
T="$T) : $f"
local T="Adding to ipset $2 "
[ "$svram" = "1" ] && T="$T (saveram)"
T="$T : $f"
echo $T
if [ "$svram" = "1" ]; then

View File

@@ -38,8 +38,8 @@ ZUSERLIST_IPBAN="$IPSET_DIR/zapret-hosts-user-ipban.txt"
ZUSERLIST_EXCLUDE="$IPSET_DIR/zapret-hosts-user-exclude.txt"
IP2NET="$IPSET_DIR/../ip2net/ip2net"
MDIG="$IPSET_DIR/../mdig/mdig"
[ -n "$IP2NET" ] || IP2NET="$IPSET_DIR/../ip2net/ip2net"
[ -n "$MDIG" ] || MDIG="$IPSET_DIR/../mdig/mdig"
[ -z "$MDIG_THREADS" ] && MDIG_THREADS=30