diff --git a/package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml b/package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml index 2f36524bf6..27ad4698c0 100644 --- a/package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml +++ b/package/jsda/AdGuardHome/files/etc/AdGuardHome/AdGuardHome.yaml @@ -10,11 +10,11 @@ dns: protection_enabled: true filtering_enabled: true blocking_mode: nxdomain - blocked_response_ttl: 300 + blocked_response_ttl: 3000 querylog_enabled: true - ratelimit: 20 + ratelimit: 0 ratelimit_whitelist: [] - refuse_any: true + refuse_any: false bootstrap_dns: - 1.0.0.1:53 - 2606:4700:4700::1001:53 @@ -34,16 +34,18 @@ dns: - 202.38.93.153:5353 - 202.141.162.123:5353 - https://https://neatdns.ustclug.org/resolve + - https://dns.rubyfish.cn/dns-query + - https://ndns.233py.com/dns-query + - https://edns.233py.com/dns-query + - https://wdns.233py.com/dns-query + - https://sdns.233py.com/dns-query - 1.1.1.1 - - 1.0.0.1 - 9.9.9.9 - 117.50.10.10 - 119.29.29.29 - 114.114.114.114 - 223.5.5.5 - - 223.6.6.6 - 208.67.222.222:5353 - - 208.67.220.220:5353 - 2606:4700:4700::1111 - 2606:4700:4700::1001 - tcp://8.8.8.8 diff --git a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua index dae2be2fe5..11249b76c8 100755 --- a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua @@ -25,7 +25,7 @@ local function is_fullcone() end local function is_dns() - return luci.sys.call("pgrep dnscache >/dev/null") == 0 + return luci.sys.call("[ `uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null` -ne 3 ] && pgrep dnscache >/dev/null || pgrep AdGuardHome >/dev/null") == 0 end local function is_ad() diff --git a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua index 85a4d65dc2..5d42da4725 100755 --- a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua +++ b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua @@ -25,7 +25,7 @@ local function is_fullcone() end local function is_dns() - return luci.sys.call("pgrep dnscache >/dev/null") == 0 + return luci.sys.call("[ `uci get flowoffload.@flow[0].dnscache_enable 2>/dev/null` -ne 3 ] && pgrep dnscache >/dev/null || pgrep AdGuardHome >/dev/null") == 0 end local function is_ad() @@ -41,4 +41,4 @@ function action_status() dns_state = is_dns(), ad_state = is_ad() }) -end \ No newline at end of file +end diff --git a/package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua b/package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua index 089e238806..eae4f2145e 100755 --- a/package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua +++ b/package/lean/luci-app-sfe/luasrc/model/cbi/sfe.lua @@ -47,7 +47,7 @@ dns.default = 0 dns.rmempty = false dns.description = translate("Enable DNS Cache Acceleration and anti ISP DNS pollution") -o = s:option(ListValue, "dnscache_enable", translate("Resolve Dns Mode"), translate("AdGuardHome After setting up, shut down DNS acceleration normally and save configuration file") .. button) +o = s:option(ListValue, "dnscache_enable", translate("Resolve Dns Mode"), translate("AdGuardHome's login username/passwd: AdGuardHome, web console addr: IP:3001") .. button) o:value("1", translate("Use Pdnsd query and cache")) if nixio.fs.access("/usr/bin/dnsforwarder") then o:value("2", translate("Use dnsforwarder query and cache")) diff --git a/package/lean/luci-app-sfe/po/zh-cn/sfe.po b/package/lean/luci-app-sfe/po/zh-cn/sfe.po index 1cac25ac1d..fd76127acc 100755 --- a/package/lean/luci-app-sfe/po/zh-cn/sfe.po +++ b/package/lean/luci-app-sfe/po/zh-cn/sfe.po @@ -76,8 +76,8 @@ msgstr "支持多个上游DNS服务器,用','分隔(注意用英文逗号). msgid "Muitiple IPV6 DNS server can saperate with ','" msgstr "支持dnsforwarder解析多个上游IPV6 DNS服务器,用','分隔(注意用英文逗号).请填写您最快的DNS服务器" -msgid "AdGuardHome After setting up, shut down DNS acceleration normally and save configuration file" -msgstr "AdGuardHome设置完后正常关闭dns加速即可保存配置文件.AdGuardHome管理页面IP:3001 管理账号密码:AdGuardHome" +msgid "AdGuardHome's login username/passwd: AdGuardHome, web console addr: IP:3001" +msgstr "AdGuardHome 网页控制台地址:IP:3001 登录账号/密码:AdGuardHome" msgid "Dnsmasq rejects IPv6 parsing and optimizes domestic complex dual-stack network" msgstr "dnsmasq不返回ipv6解析结果,优化国内复杂双栈网络"