diff --git a/overture/config.yml b/overture/config.yml index a1a7a0a..50584bc 100644 --- a/overture/config.yml +++ b/overture/config.yml @@ -1,10 +1,11 @@ bindAddress: :5353 +dohEnabled: false primaryDNS: - name: Domestic address: 127.0.0.1:4053 protocol: udp socks5Address: - timeout: 4 + timeout: 6 ednsClientSubnet: policy: disable externalIP: @@ -14,22 +15,23 @@ alternativeDNS: address: 127.0.0.1:6053 protocol: udp socks5Address: - timeout: 8 + timeout: 6 ednsClientSubnet: policy: disable externalIP: noCookie: true onlyPrimaryDNS: false ipv6UseAlternativeDNS: false -alternativeDNSConcurrent: false +alternativeDNSConcurrent: true whenPrimaryDNSAnswerNoneUse: alternativeDNS ipNetworkFile: - primary: /etc/cleardns/list/china_ip_list.txt - alternative: /etc/overture/loopback.txt + primary: /etc/cleardns/asset/china_ip.txt + alternative: /dev/null domainFile: - primary: /etc/cleardns/list/chinalist.txt - alternative: /etc/cleardns/list/gfwlist.txt + primary: /etc/cleardns/asset/chinalist.txt + alternative: /etc/cleardns/asset/gfwlist.txt matcher: suffix-tree hostsFile: - hostsFile: /etc/overture/hosts + hostsFile: /etc/hosts finder: full-map +cacheSize: 4096 diff --git a/overture/hosts b/overture/hosts deleted file mode 100644 index 75721cd..0000000 --- a/overture/hosts +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1 localhost diff --git a/overture/loopback.txt b/overture/loopback.txt deleted file mode 100644 index 5a36518..0000000 --- a/overture/loopback.txt +++ /dev/null @@ -1 +0,0 @@ -127.0.0.0/8 diff --git a/overture/update.sh b/overture/update.sh index 3bbb1d9..1b3052d 100755 --- a/overture/update.sh +++ b/overture/update.sh @@ -1,14 +1,15 @@ -LIST_DIR="/etc/cleardns/list" -TEMP_DIR="$LIST_DIR/temp" -[ -f "$LIST_DIR/no_auto_update" ] && exit -rm -rf $TEMP_DIR -mkdir -p $TEMP_DIR -wget -P $TEMP_DIR https://res.343.re/Share/chinalist/chinalist.txt -wget -P $TEMP_DIR https://res.343.re/Share/gfwlist/gfwlist.txt -wget -P $TEMP_DIR https://raw.fastgit.org/17mon/china_ip_list/master/china_ip_list.txt -[ -s "$TEMP_DIR/chinalist.txt" ] && mv -f $TEMP_DIR/chinalist.txt $LIST_DIR/ -[ -s "$TEMP_DIR/gfwlist.txt" ] && mv -f $TEMP_DIR/gfwlist.txt $LIST_DIR/ -[ -s "$TEMP_DIR/china_ip_list.txt" ] && mv -f $TEMP_DIR/china_ip_list.txt $LIST_DIR/ -rm -rf $TEMP_DIR -ps -ef | grep overture | grep -v grep | grep -v sh | awk '{print $1}' | xargs kill -9 -/usr/bin/overture -c /etc/overture/config.yml > /dev/null 2>&1 & +ASSET_DIR="/etc/cleardns/asset" +[ -f "$ASSET_DIR/no_auto_update" ] && exit + +TEMP_DIR="$ASSET_DIR/temp" +rm -rf "$TEMP_DIR" && mkdir -p "$TEMP_DIR" +wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/gfwlist/gfwlist.txt +wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/chinalist.txt +wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/china_ip.txt + +[ -s "$TEMP_DIR/gfwlist.txt" ] && mv -f "$TEMP_DIR/gfwlist.txt" "$ASSET_DIR" +[ -s "$TEMP_DIR/chinalist.txt" ] && mv -f "$TEMP_DIR/chinalist.txt" "$ASSET_DIR" +[ -s "$TEMP_DIR/china_ip.txt" ] && mv -f "$TEMP_DIR/china_ip.txt" "$ASSET_DIR" + +rm -rf "$TEMP_DIR" +pgrep overture | xargs kill