From cbb268ddc8d25b81e8d67af4fdeebe396a0a49b8 Mon Sep 17 00:00:00 2001 From: bol-van Date: Mon, 20 Nov 2023 23:14:43 +0300 Subject: [PATCH] list.nethub.fi was closed. dirty hack enable --- ipset/get_reestr_preresolved.sh | 7 ++++++- ipset/get_reestr_preresolved_smart.sh | 7 ++++++- ipset/get_reestr_resolvable_domains.sh | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ipset/get_reestr_preresolved.sh b/ipset/get_reestr_preresolved.sh index d4a9b58..eedaba6 100755 --- a/ipset/get_reestr_preresolved.sh +++ b/ipset/get_reestr_preresolved.sh @@ -7,6 +7,11 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" TMPLIST="$TMPDIR/list_nethub.txt" + +# free domain was discontinued +HOST=list.nethub.fi +IP=69.197.166.36 +RESOLVE="--resolve $HOST:80:$IP" URL4="http://list.nethub.fi/reestr_resolved4.txt" URL6="http://list.nethub.fi/reestr_resolved6.txt" @@ -15,7 +20,7 @@ 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" || + curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || { echo list download failed : $1 exit 2 diff --git a/ipset/get_reestr_preresolved_smart.sh b/ipset/get_reestr_preresolved_smart.sh index 49fe329..0ad3d11 100755 --- a/ipset/get_reestr_preresolved_smart.sh +++ b/ipset/get_reestr_preresolved_smart.sh @@ -7,6 +7,11 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" TMPLIST="$TMPDIR/list_nethub.txt" + +# free domain was discontinued +HOST=list.nethub.fi +IP=69.197.166.36 +RESOLVE="--resolve $HOST:80:$IP" URL4="http://list.nethub.fi/reestr_smart4.txt" URL6="http://list.nethub.fi/reestr_smart6.txt" @@ -15,7 +20,7 @@ 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" || + curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || { echo list download failed : $1 exit 2 diff --git a/ipset/get_reestr_resolvable_domains.sh b/ipset/get_reestr_resolvable_domains.sh index ee236a4..ab113af 100755 --- a/ipset/get_reestr_resolvable_domains.sh +++ b/ipset/get_reestr_resolvable_domains.sh @@ -6,13 +6,18 @@ IPSET_DIR="$(cd "$IPSET_DIR"; pwd)" . "$IPSET_DIR/def.sh" TMPLIST="$TMPDIR/list_nethub.txt" + +# free domain was discontinued +HOST=list.nethub.fi +IP=69.197.166.36 +RESOLVE="--resolve $HOST:80:$IP" 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" || + curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || { echo list download failed : $1 exit 2