diff --git a/init.d/macos/functions b/init.d/macos/functions index 6e9e076..0734f8e 100644 --- a/init.d/macos/functions +++ b/init.d/macos/functions @@ -8,7 +8,7 @@ HOSTLIST="$ZHOSTLIST.gz" [ -f "$HOSTLIST" ] || HOSTLIST="$ZUSERLIST" PIDDIR=/var/run -TPPORT=988 +[ -n "$TPPORT" ] || TPPORT=988 TPWS_USER=daemon TPWS_WAIT="--bind-wait-ip=60" TPWS="$ZAPRET_BASE/tpws/tpws" diff --git a/init.d/openwrt/functions b/init.d/openwrt/functions index a7b3d0d..f2d4397 100644 --- a/init.d/openwrt/functions +++ b/init.d/openwrt/functions @@ -3,8 +3,8 @@ [ -n "$ZAPRET_BASE" ] || ZAPRET_BASE=/opt/zapret . "$ZAPRET_BASE/config" -QNUM=200 -TPPORT=988 +[ -n "$QNUM" ] || QNUM=200 +[ -n "$TPPORT" ] || TPPORT=988 TPWS_USER=daemon TPWS_LOCALHOST4=127.0.0.127 [ -n "$DESYNC_MARK" ] || DESYNC_MARK=0x40000000 diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret index d469f9b..e7bfb71 100755 --- a/init.d/openwrt/zapret +++ b/init.d/openwrt/zapret @@ -19,13 +19,10 @@ fi PIDDIR=/var/run -QNUM=200 NFQWS_USER=daemon NFQWS="$ZAPRET_BASE/nfq/nfqws" NFQWS_OPT_BASE="--qnum=$QNUM --user=$NFQWS_USER" -TPWS_USER=daemon -TPPORT=988 TPWS="$ZAPRET_BASE/tpws/tpws" TPWS_LOCALHOST4=127.0.0.127 HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz" diff --git a/init.d/sysv/functions b/init.d/sysv/functions index 5d9d23a..1391ed1 100644 --- a/init.d/sysv/functions +++ b/init.d/sysv/functions @@ -10,11 +10,11 @@ IPSET_CR="$ZAPRET_BASE/ipset/create_ipset.sh" WS_USER=tpws -QNUM=200 +[ -n "$QNUM" ] || QNUM=200 NFQWS="$ZAPRET_BASE/nfq/nfqws" NFQWS_OPT_BASE="--qnum=$QNUM --user=$WS_USER" -TPPORT=988 +[ -n "$TPPORT" ] || TPPORT=988 TPWS="$ZAPRET_BASE/tpws/tpws" TPWS_LOCALHOST4=127.0.0.127 HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"