From f0f7eb22f39356aaf8515303601632c02bf2bc12 Mon Sep 17 00:00:00 2001 From: sbwml <984419930@qq.com> Date: Thu, 13 Oct 2022 21:59:10 +0800 Subject: [PATCH] luci-app-mosdns: update adblock list cdn --- luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua | 8 ++++---- luci-app-mosdns/root/usr/share/mosdns/mosdns.sh | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua index 240e6f1..c365384 100644 --- a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua +++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua @@ -90,11 +90,11 @@ adblock.default = false adblock = s:option(Value, "ad_source", translate("ADblock Source")) adblock:depends("adblock", "1") -adblock.default = "https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-domains.txt" +adblock.default = "https://raw.cooluc.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt" adblock:value("geosite.dat", "v2ray-geosite") -adblock:value("https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-domains.txt", "anti-AD") -adblock:value("https://cdn.jsdelivr.net/gh/sjhgvr/oisd@main/dbl_basic.txt", "oisd (basic)") -adblock:value("https://cdn.jsdelivr.net/gh/QiuSimons/openwrt-mos@master/dat/serverlist.txt", "QiuSimons/openwrt-mos") +adblock:value("https://raw.cooluc.com/privacy-protection-tools/anti-AD/master/anti-ad-domains.txt", "anti-AD") +adblock:value("https://raw.cooluc.com/sjhgvr/oisd/main/dbl_basic.txt", "oisd (basic)") +adblock:value("https://raw.cooluc.com/QiuSimons/openwrt-mos/master/dat/serverlist.txt", "QiuSimons/openwrt-mos") reload_service = s:option( Button, "_reload", translate("Reload Service"), translate("Reload service to take effect of new configuration")) reload_service.write = function() diff --git a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh index 30fa3a7..0e7f8fb 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh @@ -41,8 +41,9 @@ adlist_update() ( ad_source=$(uci -q get mosdns.config.ad_source) [ $ad_source = "geosite.dat" ] && exit 0 AD_TMPDIR=$(mktemp -d) || exit 1 - curl --connect-timeout 60 -m 900 --ipv4 -fSLo "$AD_TMPDIR/adlist.txt" "$ad_source" + curl --connect-timeout 60 -m 90 --ipv4 -fSLo "$AD_TMPDIR/adlist.txt" "$ad_source" if [ $? -ne 0 ]; then + rm -rf $AD_TMPDIR exit 1 else \cp $AD_TMPDIR/adlist.txt /etc/mosdns/rule/adlist.txt