From dfa1bc6ee5e65a7ae655005b2a137dd1e955d4fb Mon Sep 17 00:00:00 2001 From: bol-van Date: Tue, 21 Nov 2023 15:43:36 +0300 Subject: [PATCH] move preresolved lists to github --- ipset/get_reestr_preresolved.sh | 12 ++++-------- ipset/get_reestr_preresolved_smart.sh | 12 ++++-------- ipset/get_reestr_resolvable_domains.sh | 9 +++------ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/ipset/get_reestr_preresolved.sh b/ipset/get_reestr_preresolved.sh index eedaba6..984035a 100755 --- a/ipset/get_reestr_preresolved.sh +++ b/ipset/get_reestr_preresolved.sh @@ -8,19 +8,15 @@ 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" - +BASEURL="https://raw.githubusercontent.com/bol-van/rulist/main" +URL4="$BASEURL/reestr_resolved4.txt" +URL6="$BASEURL/reestr_resolved6.txt" dl() { # $1 - url # $2 - file - curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || + 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 diff --git a/ipset/get_reestr_preresolved_smart.sh b/ipset/get_reestr_preresolved_smart.sh index 0ad3d11..e8a70ae 100755 --- a/ipset/get_reestr_preresolved_smart.sh +++ b/ipset/get_reestr_preresolved_smart.sh @@ -8,19 +8,15 @@ 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" - +BASEURL="https://raw.githubusercontent.com/bol-van/rulist/main" +URL4="$BASEURL/reestr_smart4.txt" +URL6="$BASEURL/reestr_smart6.txt" dl() { # $1 - url # $2 - file - curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || + 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 diff --git a/ipset/get_reestr_resolvable_domains.sh b/ipset/get_reestr_resolvable_domains.sh index ab113af..010b598 100755 --- a/ipset/get_reestr_resolvable_domains.sh +++ b/ipset/get_reestr_resolvable_domains.sh @@ -7,17 +7,14 @@ 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" -URL="http://list.nethub.fi/reestr_hostname_resolvable.txt" +BASEURL="https://raw.githubusercontent.com/bol-van/rulist/main" +URL="$BASEURL/reestr_hostname_resolvable.txt" dl() { # $1 - url # $2 - file - curl -H "Accept-Encoding: gzip" $RESOLVE -k --fail --max-time 180 --connect-timeout 10 --retry 4 --max-filesize 33554432 "$1" | gunzip - >"$TMPLIST" || + 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