diff --git a/install_easy.sh b/install_easy.sh index 5ac9c1e..ebef8ff 100755 --- a/install_easy.sh +++ b/install_easy.sh @@ -241,7 +241,7 @@ select_getlist() echo if ask_yes_no $D "do you want to auto download ip/host list"; then if [ "$MODE_FILTER" = "hostlist" ] ; then - GETLISTS="get_antizapret_domains.sh get_reestr_hostlist.sh" + GETLISTS="get_antizapret_domains.sh get_reestr_resolvable_domains.sh get_reestr_hostlist.sh" GETLIST_DEF="get_antizapret_domains.sh" else GETLISTS="get_user.sh get_antifilter_ip.sh get_antifilter_ipsmart.sh get_antifilter_ipsum.sh get_antifilter_ipresolve.sh get_antifilter_allyouneed.sh get_reestr_resolve.sh get_reestr_preresolved.sh get_reestr_preresolved_smart.sh" diff --git a/ipset/get_reestr_resolvable_domains.sh b/ipset/get_reestr_resolvable_domains.sh new file mode 100755 index 0000000..ee236a4 --- /dev/null +++ b/ipset/get_reestr_resolvable_domains.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +IPSET_DIR="$(dirname "$0")" +IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" + +. "$IPSET_DIR/def.sh" + +TMPLIST="$TMPDIR/list_nethub.txt" +URL="http://list.nethub.fi/reestr_hostname_resolvable.txt" + +dl() +{ + # $1 - url + # $2 - file + curl -H "Accept-Encoding: gzip" -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || + { + echo list download failed : $1 + exit 2 + } + dlsize=$(LANG=C wc -c "$TMPLIST" | xargs | cut -f 1 -d ' ') + if test $dlsize -lt 65536; then + echo list is too small : $dlsize bytes. can be bad. + exit 2 + fi + zz "$2" <"$TMPLIST" + rm -f "$TMPLIST" +} + +dl "$URL" "$ZHOSTLIST" + +hup_zapret_daemons + +exit 0