drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-19 21:42:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

init : some quotes

Browse Source
This commit is contained in:
bolvan 2019-05-24 08:46:10 +03:00
parent 5926b835ba
commit 1c0f8a326f
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.d/openwrt/zapret
View File

@ -20,8 +20,8 @@ TPWS_USER=daemon
TPPORT_HTTP=1188 TPPORT_HTTP=1188
TPPORT_HTTPS=1189 TPPORT_HTTPS=1189
TPWS="$ZAPRET_BASE/tpws/tpws" TPWS="$ZAPRET_BASE/tpws/tpws"
TPWS_HOSTLIST=$ZAPRET_BASE/ipset/zapret-hosts.txt.gz TPWS_HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"
[ -f "$TPWS_HOSTLIST" ] || TPWS_HOSTLIST=$ZAPRET_BASE/ipset/zapret-hosts-user.txt [ -f "$TPWS_HOSTLIST" ] || TPWS_HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
TPWS_OPT_BASE="--user=$TPWS_USER --bind-addr=127.0.0.1" TPWS_OPT_BASE="--user=$TPWS_USER --bind-addr=127.0.0.1"
TPWS_OPT_BASE6="--user=$TPWS_USER --bind-addr=::1" TPWS_OPT_BASE6="--user=$TPWS_USER --bind-addr=::1"
# first wait for lan to ifup, then wait for bind-wait-ip-linklocal seconds for link local address and bind-wait-ip for any ipv6 as the worst case # first wait for lan to ifup, then wait for bind-wait-ip-linklocal seconds for link local address and bind-wait-ip for any ipv6 as the worst case

4
init.d/sysv/functions
View File

@ -17,8 +17,8 @@ NFQWS_OPT_BASE="--qnum=$QNUM --user=$WS_USER"
TPPORT_HTTP=1188 TPPORT_HTTP=1188
TPPORT_HTTPS=1189 TPPORT_HTTPS=1189
TPWS="$ZAPRET_BASE/tpws/tpws" TPWS="$ZAPRET_BASE/tpws/tpws"
TPWS_HOSTLIST=$ZAPRET_BASE/ipset/zapret-hosts.txt.gz TPWS_HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts.txt.gz"
[ -f "$TPWS_HOSTLIST" ] || TPWS_HOSTLIST=$ZAPRET_BASE/ipset/zapret-hosts-user.txt [ -f "$TPWS_HOSTLIST" ] || TPWS_HOSTLIST="$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
TPWS_OPT_BASE="--user=$WS_USER --bind-addr=127.0.0.1" TPWS_OPT_BASE="--user=$WS_USER --bind-addr=127.0.0.1"
TPWS_OPT_BASE6="--user=$WS_USER --bind-addr=::1" TPWS_OPT_BASE6="--user=$WS_USER --bind-addr=::1"
# first wait for lan to ifup, then wait for bind-wait-ip-linklocal seconds for link local address and bind-wait-ip for any ipv6 as the worst case # first wait for lan to ifup, then wait for bind-wait-ip-linklocal seconds for link local address and bind-wait-ip for any ipv6 as the worst case

2
ipset/create_ipset.sh
View File

@ -5,7 +5,7 @@
SCRIPT=$(readlink -f "$0") SCRIPT=$(readlink -f "$0")
EXEDIR=$(dirname "$SCRIPT") EXEDIR=$(dirname "$SCRIPT")
IPSET_OPT="hashsize 131072 maxelem 524288" IPSET_OPT="hashsize 131072 maxelem 524288"
IP2NET=$EXEDIR/../ip2net/ip2net IP2NET="$EXEDIR/../ip2net/ip2net"
. "$EXEDIR/def.sh" . "$EXEDIR/def.sh"

28
ipset/def.sh
View File

@ -3,24 +3,24 @@
TMPDIR=/tmp TMPDIR=/tmp
ZIPSET=zapret ZIPSET=zapret
ZIPSET6=zapret6 ZIPSET6=zapret6
ZIPLIST=$EXEDIR/zapret-ip.txt ZIPLIST="$EXEDIR/zapret-ip.txt"
ZIPLIST6=$EXEDIR/zapret-ip6.txt ZIPLIST6="$EXEDIR/zapret-ip6.txt"
ZIPLIST_EXCLUDE=$EXEDIR/zapret-ip-exclude.txt ZIPLIST_EXCLUDE="$EXEDIR/zapret-ip-exclude.txt"
ZIPLIST_EXCLUDE6=$EXEDIR/zapret-ip-exclude6.txt ZIPLIST_EXCLUDE6="$EXEDIR/zapret-ip-exclude6.txt"
ZIPLIST_USER=$EXEDIR/zapret-ip-user.txt ZIPLIST_USER="$EXEDIR/zapret-ip-user.txt"
ZIPLIST_USER6=$EXEDIR/zapret-ip-user6.txt ZIPLIST_USER6="$EXEDIR/zapret-ip-user6.txt"
ZUSERLIST=$EXEDIR/zapret-hosts-user.txt ZUSERLIST="$EXEDIR/zapret-hosts-user.txt"
ZHOSTLIST=$EXEDIR/zapret-hosts.txt ZHOSTLIST="$EXEDIR/zapret-hosts.txt"
ZIPSET_IPBAN=ipban ZIPSET_IPBAN=ipban
ZIPSET_IPBAN6=ipban6 ZIPSET_IPBAN6=ipban6
ZIPLIST_IPBAN=$EXEDIR/zapret-ip-ipban.txt ZIPLIST_IPBAN="$EXEDIR/zapret-ip-ipban.txt"
ZIPLIST_IPBAN6=$EXEDIR/zapret-ip-ipban6.txt ZIPLIST_IPBAN6="$EXEDIR/zapret-ip-ipban6.txt"
ZIPLIST_USER_IPBAN=$EXEDIR/zapret-ip-user-ipban.txt ZIPLIST_USER_IPBAN="$EXEDIR/zapret-ip-user-ipban.txt"
ZIPLIST_USER_IPBAN6=$EXEDIR/zapret-ip-user-ipban6.txt ZIPLIST_USER_IPBAN6="$EXEDIR/zapret-ip-user-ipban6.txt"
ZUSERLIST_IPBAN=$EXEDIR/zapret-hosts-user-ipban.txt ZUSERLIST_IPBAN="$EXEDIR/zapret-hosts-user-ipban.txt"
MDIG=$EXEDIR/../mdig/mdig MDIG="$EXEDIR/../mdig/mdig"
[ -z "$MDIG_THREADS" ] && MDIG_THREADS=30 [ -z "$MDIG_THREADS" ] && MDIG_THREADS=30
zzexist() zzexist()

2
ipset/get_antizapret.sh
View File

@ -8,7 +8,7 @@ EXEDIR=$(dirname "$SCRIPT")
#ZURL=https://github.com/zapret-info/z-i/raw/master/dump.csv #ZURL=https://github.com/zapret-info/z-i/raw/master/dump.csv
ZURL=http://antizapret.prostovpn.org/iplist.txt ZURL=http://antizapret.prostovpn.org/iplist.txt
ZIPLISTTMP=$TMPDIR/zapret-ip.txt ZIPLISTTMP="$TMPDIR/zapret-ip.txt"
getuser getuser

6
ipset/get_combined.sh
View File

@ -6,12 +6,12 @@ EXEDIR=$(dirname "$SCRIPT")
. "$EXEDIR/def.sh" . "$EXEDIR/def.sh"
ZREESTR=$TMPDIR/reestr.txt ZREESTR="$TMPDIR/reestr.txt"
#ZURL_REESTR=https://reestr.rublacklist.net/api/current #ZURL_REESTR=https://reestr.rublacklist.net/api/current
ZURL_REESTR=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv ZURL_REESTR=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv
ZAZ=$TMPDIR/zapret-ip.txt ZAZ="$TMPDIR/zapret-ip.txt"
ZURL_AZ=http://antizapret.prostovpn.org/iplist.txt ZURL_AZ=http://antizapret.prostovpn.org/iplist.txt
ZIPLIST_IPBAN_TMP=/tmp/zapret-ipban.txt ZIPLIST_IPBAN_TMP="$TMPDIR/zapret-ipban.txt"
getuser getuser

2
ipset/get_hostlist.sh
View File

@ -6,7 +6,7 @@ EXEDIR=$(dirname "$SCRIPT")
. "$EXEDIR/def.sh" . "$EXEDIR/def.sh"
ZREESTR=$TMPDIR/zapret.txt ZREESTR="$TMPDIR/zapret.txt"
#ZURL=https://reestr.rublacklist.net/api/current #ZURL=https://reestr.rublacklist.net/api/current
ZURL=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv ZURL=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv

6
ipset/get_reestr.sh
View File

@ -6,9 +6,9 @@ EXEDIR=$(dirname "$SCRIPT")
. "$EXEDIR/def.sh" . "$EXEDIR/def.sh"
ZREESTR=$TMPDIR/zapret.txt ZREESTR="$TMPDIR/zapret.txt"
ZDIG=$TMPDIR/zapret-dig.txt ZDIG="$TMPDIR/zapret-dig.txt"
ZIPLISTTMP=$TMPDIR/zapret-ip.txt ZIPLISTTMP="$TMPDIR/zapret-ip.txt"
#ZURL=https://reestr.rublacklist.net/api/current #ZURL=https://reestr.rublacklist.net/api/current
ZURL=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv ZURL=https://raw.githubusercontent.com/zapret-info/z-i/master/dump.csv