update: overture config

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
+  primary: /etc/cleardns/asset/china_ip.txt
-  alternative: /etc/overture/loopback.txt
+  alternative: /dev/null
 domainFile:
-  primary: /etc/cleardns/list/chinalist.txt
+  primary: /etc/cleardns/asset/chinalist.txt
-  alternative: /etc/cleardns/list/gfwlist.txt
+  alternative: /etc/cleardns/asset/gfwlist.txt
   matcher: suffix-tree
 hostsFile:
-  hostsFile: /etc/overture/hosts
+  hostsFile: /etc/hosts
   finder: full-map
+cacheSize: 4096

overture/hosts

@@ -1 +0,0 @@
-127.0.0.1 localhost

overture/loopback.txt

@@ -1 +0,0 @@
-127.0.0.0/8

overture/update.sh

@@ -1,14 +1,15 @@
-LIST_DIR="/etc/cleardns/list"
+ASSET_DIR="/etc/cleardns/asset"
-TEMP_DIR="$LIST_DIR/temp"
+[ -f "$ASSET_DIR/no_auto_update" ] && exit
-[ -f "$LIST_DIR/no_auto_update" ] && exit
+
-rm -rf $TEMP_DIR
+TEMP_DIR="$ASSET_DIR/temp"
-mkdir -p $TEMP_DIR
+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.dnomd343.top/Share/gfwlist/gfwlist.txt
-wget -P $TEMP_DIR https://res.343.re/Share/gfwlist/gfwlist.txt
+wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/chinalist.txt
-wget -P $TEMP_DIR https://raw.fastgit.org/17mon/china_ip_list/master/china_ip_list.txt
+wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/china_ip.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/gfwlist.txt" ] && mv -f "$TEMP_DIR/gfwlist.txt" "$ASSET_DIR"
-[ -s "$TEMP_DIR/china_ip_list.txt" ] && mv -f $TEMP_DIR/china_ip_list.txt $LIST_DIR/
+[ -s "$TEMP_DIR/chinalist.txt" ] && mv -f "$TEMP_DIR/chinalist.txt" "$ASSET_DIR"
-rm -rf $TEMP_DIR
+[ -s "$TEMP_DIR/china_ip.txt" ] && mv -f "$TEMP_DIR/china_ip.txt" "$ASSET_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 &
+rm -rf "$TEMP_DIR"
+pgrep overture | xargs kill