Browse Source

reestr moved to https

pull/21/head
bolvan 8 years ago
parent
commit
2f7bfced74
  1. 4
      ipset/get_combined.sh
  2. 4
      ipset/get_reestr.sh

4
ipset/get_combined.sh

@ -7,14 +7,14 @@ EXEDIR=$(dirname $SCRIPT)
. "$EXEDIR/def.sh" . "$EXEDIR/def.sh"
ZREESTR=$TMPDIR/reestr.txt ZREESTR=$TMPDIR/reestr.txt
ZURL_REESTR=http://reestr.rublacklist.net/api/current ZURL_REESTR=https://reestr.rublacklist.net/api/current
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
getuser getuser
# assume all https banned by ip # assume all https banned by ip
curl --fail --max-time 300 --max-filesize 41943040 "$ZURL_REESTR" -o $ZREESTR curl -k --fail --max-time 300 --max-filesize 41943040 "$ZURL_REESTR" -o $ZREESTR
dlsize=$(wc -c "$ZREESTR" | cut -f 1 -d ' ') dlsize=$(wc -c "$ZREESTR" | cut -f 1 -d ' ')
if test $dlsize -lt 1048576; then if test $dlsize -lt 1048576; then
echo reestr ip list is too small. can be bad. echo reestr ip list is too small. can be bad.

4
ipset/get_reestr.sh

@ -9,11 +9,11 @@ EXEDIR=$(dirname $SCRIPT)
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=http://reestr.rublacklist.net/api/current ZURL=https://reestr.rublacklist.net/api/current
getuser getuser
curl --fail --max-time 300 --max-filesize 41943040 "$ZURL" >$ZREESTR && { curl -k --fail --max-time 300 --max-filesize 41943040 "$ZURL" >$ZREESTR && {
dlsize=$(wc -c "$ZREESTR" | cut -f 1 -d ' ') dlsize=$(wc -c "$ZREESTR" | cut -f 1 -d ' ')
if test $dlsize -lt 204800; then if test $dlsize -lt 204800; then
echo list file is too small. can be bad. echo list file is too small. can be bad.

Loading…
Cancel
Save