update: change `china_ip` to `china-ip`

Dockerfile

@@ -43,8 +43,8 @@ COPY --from=build /tmp/release /tmp/release
 RUN \
 wget https://res.dnomd343.top/Share/gfwlist/gfwlist.txt && \
 wget https://res.dnomd343.top/Share/chinalist/chinalist.txt && \
-wget https://res.dnomd343.top/Share/chinalist/china_ip.txt && \
+wget https://res.dnomd343.top/Share/chinalist/china-ip.txt && \
-tar czf asset.tar.gz gfwlist.txt chinalist.txt china_ip.txt && \
+tar czf asset.tar.gz gfwlist.txt chinalist.txt china-ip.txt && \
 mkdir -p /tmp/asset/etc/ && mkdir -p /tmp/asset/usr/ && \
 cp -r /tmp/ClearDNS/overture/ /tmp/asset/etc/ && \
 mv asset.tar.gz /tmp/asset/etc/overture/ && \

README.md

@@ -258,7 +258,7 @@ shell> docker restart cleardns
 
 ClearDNS依据规则列表分流解析，使用以下规则文件，位于文件夹 `/etc/cleardns/asset` 中
 
-+ [`china_ip.txt`](https://res.343.re/Share/chinalist/china_ip.txt)：国内IP段
++ [`china-ip.txt`](https://res.343.re/Share/chinalist/china-ip.txt)：国内IP段
 
 + [`chinalist.txt`](https://res.343.re/Share/chinalist/chinalist.txt)：国内常见域名
 

load.sh

@@ -7,7 +7,7 @@ overture_dir="/etc/overture"
 cd $overture_dir && tar xf asset.tar.gz
 [ ! -f "$cleardns_dir/asset/gfwlist.txt" ] && cp "$overture_dir/gfwlist.txt" "$cleardns_dir/asset/gfwlist.txt"
 [ ! -f "$cleardns_dir/asset/chinalist.txt" ] && cp "$overture_dir/chinalist.txt" "$cleardns_dir/asset/chinalist.txt"
-[ ! -f "$cleardns_dir/asset/china_ip.txt" ] && cp "$overture_dir/china_ip.txt" "$cleardns_dir/asset/china_ip.txt"
+[ ! -f "$cleardns_dir/asset/china-ip.txt" ] && cp "$overture_dir/china-ip.txt" "$cleardns_dir/asset/china-ip.txt"
 
 upstream_file="/etc/cleardns/upstream.json"
 if [ ! -f "$upstream_file" ]; then

overture/config.yml

@@ -25,7 +25,7 @@ ipv6UseAlternativeDNS: false
 alternativeDNSConcurrent: true
 whenPrimaryDNSAnswerNoneUse: alternativeDNS
 ipNetworkFile:
-  primary: /etc/cleardns/asset/china_ip.txt
+  primary: /etc/cleardns/asset/china-ip.txt
   alternative: /dev/null
 domainFile:
   primary: /etc/cleardns/asset/chinalist.txt

overture/update.sh

@@ -4,13 +4,14 @@ ASSET_DIR="/etc/cleardns/asset"
 
 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/gfwlist/gfwlist.txt.gz
-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.gz
-wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/china_ip.txt
+wget -P "$TEMP_DIR" https://res.dnomd343.top/Share/chinalist/chinalist.txt.gz
 
+gunzip $TEMP_DIR/*.gz
 [ -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"
+[ -s "$TEMP_DIR/china-ip.txt" ] && mv -f "$TEMP_DIR/china-ip.txt" "$ASSET_DIR"
 
 rm -rf "$TEMP_DIR"
 pgrep overture | xargs kill