mirror of
https://github.com/bol-van/zapret.git
synced 2026-02-03 08:10:34 +03:00
init.d,ipset: ability to specify custom binaries location
This commit is contained in:
@@ -12,7 +12,7 @@ PIDDIR=/var/run
|
||||
TPWS_USER=daemon
|
||||
TPWS_WAIT="--bind-wait-ifup=30 --bind-wait-ip=30"
|
||||
TPWS_WAIT_SOCKS6="$TPWS_WAIT --bind-wait-ip-linklocal=30"
|
||||
TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
[ -n "$TPWS" ] || TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
|
||||
PF_MAIN="/etc/pf.conf"
|
||||
PF_ANCHOR_DIR=/etc/pf.anchors
|
||||
|
||||
@@ -20,10 +20,10 @@ fi
|
||||
PIDDIR=/var/run
|
||||
|
||||
NFQWS_USER=daemon
|
||||
NFQWS="$ZAPRET_BASE/nfq/nfqws"
|
||||
[ -n "$NFQWS" ] || NFQWS="$ZAPRET_BASE/nfq/nfqws"
|
||||
NFQWS_OPT_BASE="--user=$NFQWS_USER --dpi-desync-fwmark=$DESYNC_MARK"
|
||||
|
||||
TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
[ -n "$TPWS" ] || TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
TPWS_LOCALHOST4=127.0.0.127
|
||||
HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"
|
||||
[ -f "$HOSTLIST" ] || HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt"
|
||||
|
||||
@@ -11,13 +11,13 @@ IPSET_CR="$ZAPRET_BASE/ipset/create_ipset.sh"
|
||||
WS_USER=tpws
|
||||
|
||||
[ -n "$QNUM" ] || QNUM=200
|
||||
NFQWS="$ZAPRET_BASE/nfq/nfqws"
|
||||
[ -n "$NFQWS" ] || NFQWS="$ZAPRET_BASE/nfq/nfqws"
|
||||
NFQWS_OPT_BASE="--user=$WS_USER --dpi-desync-fwmark=$DESYNC_MARK"
|
||||
NFQWS_OPT_DESYNC_HTTP="${NFQWS_OPT_DESYNC_HTTP:-$NFQWS_OPT_DESYNC}"
|
||||
NFQWS_OPT_DESYNC_HTTPS="${NFQWS_OPT_DESYNC_HTTPS:-$NFQWS_OPT_DESYNC}"
|
||||
|
||||
[ -n "$TPPORT" ] || TPPORT=988
|
||||
TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
[ -n "$TPWS" ] || TPWS="$ZAPRET_BASE/tpws/tpws"
|
||||
TPWS_LOCALHOST4=127.0.0.127
|
||||
HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"
|
||||
[ -f "$HOSTLIST" ] || HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt"
|
||||
|
||||
Reference in New Issue
Block a user