Browse Source

update: remote assets url

dev
Dnomd343 2 years ago
parent
commit
73b7958944
  1. 6
      Dockerfile
  2. 14
      README.md
  3. 6
      src/loader/default.c

6
Dockerfile

@ -53,9 +53,9 @@ FROM ${ALPINE_IMG} AS asset
COPY --from=dnsproxy /tmp/dnsproxy /asset/usr/bin/ COPY --from=dnsproxy /tmp/dnsproxy /asset/usr/bin/
COPY --from=overture /tmp/overture /asset/usr/bin/ COPY --from=overture /tmp/overture /asset/usr/bin/
COPY --from=adguardhome /tmp/AdGuardHome /asset/usr/bin/ COPY --from=adguardhome /tmp/AdGuardHome /asset/usr/bin/
RUN wget https://res.dnomd343.top/Share/gfwlist/gfwlist.txt && \ RUN wget https://res.dnomd343.top/Share/cleardns/gfwlist.txt && \
wget https://res.dnomd343.top/Share/chinalist/china-ip.txt && \ wget https://res.dnomd343.top/Share/cleardns/china-ip.txt && \
wget https://res.dnomd343.top/Share/chinalist/chinalist.txt wget https://res.dnomd343.top/Share/cleardns/chinalist.txt
RUN apk add xz && tar cJf /asset/assets.tar.xz ./*.txt RUN apk add xz && tar cJf /asset/assets.tar.xz ./*.txt
COPY --from=cleardns /tmp/cleardns /asset/usr/bin/ COPY --from=cleardns /tmp/cleardns /asset/usr/bin/
COPY --from=cleardns /tmp/toJSON /asset/usr/bin/ COPY --from=cleardns /tmp/toJSON /asset/usr/bin/

14
README.md

@ -52,7 +52,7 @@ ClearDNS 支持多种 DNS 协议,首先是常规 DNS ,即基于 UDP 或 TCP
当分流器接到请求时,若在 `chinalist.txt` 中有所匹配,则只请求国内组,若在 `gfwlist.txt` 匹配,则仅请求国外组;两者均未未匹配的情况下,将同时请求国内组与国外组,若国内组返回结果在 `china-ip.txt` 中,则证明 DNS 未被污染,采纳国内组结果,若返回国外 IP 地址,则可能已经被污染,将返回国外组结果。 当分流器接到请求时,若在 `chinalist.txt` 中有所匹配,则只请求国内组,若在 `gfwlist.txt` 匹配,则仅请求国外组;两者均未未匹配的情况下,将同时请求国内组与国外组,若国内组返回结果在 `china-ip.txt` 中,则证明 DNS 未被污染,采纳国内组结果,若返回国外 IP 地址,则可能已经被污染,将返回国外组结果。
由于以上资源数据一直在变动,ClearDNS 内置了更新功能,可自动这些资源文件;数据从多个上游项目收集,每天进行一次合并整理,整合数据的源码可见[此处](./asset/),您可以自由配置更新服务器,或者禁用更新。 由于以上资源数据一直在变动,ClearDNS 内置了更新功能,可自动这些资源文件;数据从多个上游项目收集,每天进行一次合并整理,整合数据的源码可见[此处](./assets/),您可以自由配置更新服务器,或者禁用更新。
## 配置格式 ## 配置格式
@ -98,9 +98,9 @@ foreign:
assets: assets:
cron: "0 4 * * *" cron: "0 4 * * *"
update: update:
gfwlist.txt: https://res.dnomd343.top/Share/gfwlist/gfwlist.txt gfwlist.txt: https://res.dnomd343.top/Share/cleardns/gfwlist.txt
china-ip.txt: https://res.dnomd343.top/Share/chinalist/china-ip.txt china-ip.txt: https://res.dnomd343.top/Share/cleardns/china-ip.txt
chinalist.txt: https://res.dnomd343.top/Share/chinalist/chinalist.txt chinalist.txt: https://res.dnomd343.top/Share/cleardns/chinalist.txt
``` ```
### Port ### Port
@ -267,9 +267,9 @@ assets:
disable: false disable: false
cron: "0 4 * * *" cron: "0 4 * * *"
update: update:
gfwlist.txt: https://res.dnomd343.top/Share/gfwlist/gfwlist.txt gfwlist.txt: https://res.dnomd343.top/Share/cleardns/gfwlist.txt
china-ip.txt: https://res.dnomd343.top/Share/chinalist/china-ip.txt china-ip.txt: https://res.dnomd343.top/Share/cleardns/china-ip.txt
chinalist.txt: https://res.dnomd343.top/Share/chinalist/chinalist.txt chinalist.txt: https://res.dnomd343.top/Share/cleardns/chinalist.txt
``` ```
+ `disable` :是否关闭资源文件加载,默认为 `false` + `disable` :是否关闭资源文件加载,默认为 `false`

6
src/loader/default.c

@ -44,9 +44,9 @@ foreign:\n\
assets:\n\ assets:\n\
cron: \"0 4 * * *\"\n\ cron: \"0 4 * * *\"\n\
update:\n\ update:\n\
gfwlist.txt: https://res.dnomd343.top/Share/gfwlist/gfwlist.txt\n\ gfwlist.txt: https://res.dnomd343.top/Share/cleardns/gfwlist.txt\n\
china-ip.txt: https://res.dnomd343.top/Share/chinalist/china-ip.txt\n\ china-ip.txt: https://res.dnomd343.top/Share/cleardns/china-ip.txt\n\
chinalist.txt: https://res.dnomd343.top/Share/chinalist/chinalist.txt\n\ chinalist.txt: https://res.dnomd343.top/Share/cleardns/chinalist.txt\n\
" "
void load_default_config(const char *config_file) { void load_default_config(const char *config_file) {

Loading…
Cancel
Save