update 2022-05-14 07:49:16

This commit is contained in:
github-actions[bot]
2022-05-14 07:49:16 +08:00
parent 5f7d286a4a
commit d103ebf04f
9 changed files with 45 additions and 13 deletions

View File

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
PKG_ARCH_LINKEASE:=$(ARCH)
PKG_NAME:=linkease
PKG_VERSION:=0.7.0
PKG_VERSION:=0.7.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://fw.koolcenter.com/binary/LinkEase/LinuxStorage/
PKG_HASH:=26ebbb22d78fd2ceb009226a0d85a40f100d502595b59c8a43eea5e4394ee292
PKG_HASH:=5388e7afca49dc66198242c9e11c972598745d2bc3e729acb95ecb95f0f4cc5c
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-mosdns
PKG_VERSION:=1.2
PKG_VERSION:=1.3
PKG_RELEASE:=1
LUCI_TITLE:=LuCI Support for mosdns

View File

@@ -19,7 +19,6 @@ configfile.default = "./def_config.yaml"
listenport = s:option(Value, "listen_port", translate("Listen port"))
listenport.datatype = "and(port,min(1))"
listenport.default = 5335
listenport.rmempty = false
listenport:depends( "configfile", "./def_config.yaml")
loglv = s:option(ListValue, "loglv", translate("Log Level"))
@@ -27,7 +26,7 @@ loglv:value("debug", translate("Debug"))
loglv:value("info", translate("Info"))
loglv:value("warn", translate("Warning"))
loglv:value("error", translate("Error"))
loglv.default = "info"
loglv.default = "error"
loglv:depends( "configfile", "./def_config.yaml")
logfile = s:option(Value, "logfile", translate("MosDNS Log File"))
@@ -36,7 +35,6 @@ logfile.default = "/tmp/mosdns.txt"
logfile:depends( "configfile", "./def_config.yaml")
remote_dns = s:option(Value, "remote_dns1", translate("Remote DNS"))
remote_dns.rmempty = false
remote_dns.default = "tls://8.8.4.4"
remote_dns:value("tls://8.8.8.8", "8.8.8.8 (Google DNS)")
remote_dns:value("tls://8.8.4.4", "8.8.4.4 (Google DNS)")
@@ -48,7 +46,6 @@ remote_dns:value("208.67.222.222", "208.67.222.222 (Open DNS)")
remote_dns:value("208.67.220.220", "208.67.220.220 (Open DNS)")
remote_dns:depends( "configfile", "./def_config.yaml")
remote_dns = s:option(Value, "remote_dns2", " ")
remote_dns.rmempty = false
remote_dns.default = "tls://9.9.9.9"
remote_dns:value("tls://8.8.8.8", "8.8.8.8 (Google DNS)")
remote_dns:value("tls://8.8.4.4", "8.8.4.4 (Google DNS)")
@@ -66,7 +63,7 @@ redirect.default = true
adblock = s:option(Flag, "adblock", translate("Enable DNS ADblock"))
adblock:depends( "configfile", "./def_config.yaml")
adblock.default = true
adblock.default = false
set_config = s:option(Button, "set_config", translate("DNS Helper"))
set_config.inputtitle = translate("Apply")

View File

@@ -4,6 +4,7 @@ local white_list_file = "/etc/mosdns/whitelist.txt"
local block_list_file = "/etc/mosdns/rule/blocklist.txt"
local hosts_list_file = "/etc/mosdns/rule/hosts.txt"
local redirect_list_file = "/etc/mosdns/rule/redirect.txt"
local cus_config_file = "/etc/mosdns/cus_config.yaml"
m = Map("mosdns")
@@ -14,6 +15,7 @@ s:tab("white_list", translate("White Lists"))
s:tab("block_list", translate("Block Lists"))
s:tab("hosts_list", translate("Hosts"))
s:tab("redirect_list", translate("Redirect"))
s:tab("cus_config", translate("Cus Config"))
o = s:taboption("white_list", TextValue, "whitelist", "", "<font color='red'>" .. translate("These domain names allow DNS resolution with the highest priority. Please input the domain names of websites, every line can input only one website domain. For example: hm.baidu.com.") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Default Config' profiles.") .. "</font>")
o.rows = 15
@@ -55,6 +57,16 @@ o.validate = function(self, value)
return value
end
o = s:taboption("cus_config", TextValue, "Cus Config", "", "<font color='red'>" .. translate("View the Custom YAML Configuration file used by this MosDNS. You can edit it as you own need.") .. "</font>" .. "<font color='#00bd3e'>" .. translate("<br>The list of rules only apply to 'Custom Config' profiles.") .. "</font>")
o.rows = 30
o.wrap = "off"
o.cfgvalue = function(self, section) return nixio.fs.readfile(cus_config_file) or "" end
o.write = function(self, section, value) nixio.fs.writefile(cus_config_file, value:gsub("\r\n", "\n")) end
o.remove = function(self, section, value) nixio.fs.writefile(cus_config_file, "") end
o.validate = function(self, value)
return value
end
local apply = luci.http.formvalue("cbi.apply")
if apply then
luci.sys.exec("/etc/init.d/mosdns reload")

View File

@@ -25,8 +25,8 @@ msgstr "启用 DNS 重定向"
msgid "Enable DNS ADblock"
msgstr "启用 DNS 广告过滤"
msgid "<font color=\"ff0000\"><strong>View the Custom YAML Configuration file used by this MosDNS. You can edit it as you own need."
msgstr "<font color=\"ff0000\"><strong>注意!此页的更改仅当 'MosDNS 配置文件选择' 为 '自定义配置' 时才会生效"
msgid "View the Custom YAML Configuration file used by this MosDNS. You can edit it as you own need."
msgstr "注意!此页的更改仅当 'MosDNS 配置文件选择' 为 '自定义配置' 时才会生效"
msgid "Geodata Update"
msgstr "数据库更新"
@@ -115,6 +115,9 @@ msgstr "规则列表"
msgid "Rule Settings"
msgstr "自定义规则列表"
msgid "<br>The list of rules only apply to 'Custom Config' profiles."
msgstr "<br>规则列表仅适用于 “自定义配置” 配置文件"
msgid "<br>The list of rules only apply to 'Default Config' profiles."
msgstr "<br>规则列表仅适用于 “内置预设” 配置文件"

View File

@@ -4949,7 +4949,6 @@ ads.cybersales.cz
ads.dada.it
ads.dailycamera.com
ads.data.pplive.com
ads.datingyes.com
ads.delfin.bg
ads.deltha.hu
ads.dennisnet.co.uk
@@ -25765,7 +25764,6 @@ hududushy.com
hueads.com
hueadsortb.com
hueadsxml.com
huezzcjskf.site
hufwitew.com
hugedomains.com
hugeincome.cf

View File

@@ -2,3 +2,24 @@ tracking.miui.com
tracking.intl.miui.com
api.intl.miui.com
stat.xiaomi.com
checkip.synology.com
checkipv6.synology.com
checkport.synology.com
ddns.synology.com
account.synology.com
whatismyip.akamai.com
checkip.dyndns.org
teamviewer.com
bing.com
api.ipify.org
epicgames.com
emby.kyarucloud.moe
keyword:sglong
keyword:sgshort
keyword:sgminorshort
keyword:sgaxshort
keyword:sgfindershort
keyword:apple
keyword:aaplimg
keyword:itunes
keyword:icloud

View File

@@ -12,6 +12,7 @@ return view.extend({
return Promise.all([
fs.exec('/etc/init.d/wizard', ['reconfig']),
uci.changes(),
uci.load('wireless'),
uci.load('wizard')
]);
},

View File

@@ -11,6 +11,6 @@ friendlyelec,nanopi-r2s)
friendlyelec,nanopi-r2c)
[ "$(uci get network.$INTERFACE.device)" = "br-lan" ] && \
[ "$ACTION" = "ifup" ] && \
$ETHTOOL -K eth0 rx off tx off
$ETHTOOL -K eth1 rx off tx off
;;
esac