diff --git a/package/jsda/luci-app-smartdns/Makefile b/package/jsda/luci-app-smartdns/Makefile index 15b31a40bf..efd9e25ebc 100644 --- a/package/jsda/luci-app-smartdns/Makefile +++ b/package/jsda/luci-app-smartdns/Makefile @@ -8,6 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for smartdns LUCI_DEPENDS:=+smartdns +PKG_VERSION:=2019.11.02 +PKG_RELEASE:=1 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua b/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua index 5d1a475d7b..79bb815325 100644 --- a/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua +++ b/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua @@ -16,6 +16,7 @@ s = m:section(TypedSection, "smartdns", translate("Settings"), translate("Genera s.anonymous = true s:tab("settings", translate("General Settings")) +s:tab("seconddns", translate("Second Server Settings")) s:tab("custom", translate("Custom Settings")) ---- Eanble @@ -92,10 +93,92 @@ o.placeholder = "300" o.default = 300 o.optional = true +---- second dns server ---- rr-ttl-max o = s:taboption("settings", Value, "rr_ttl_max", translate("Domain TTL Max"), translate("Maximum TTL for all domain result.")) o.rempty = true +---- Eanble +o = s:taboption("seconddns", Flag, "seconddns_enabled", translate("Enable"), translate("Enable or disable second DNS server.")) +o.default = o.disabled +o.rempty = false + +---- Port +o = s:taboption("seconddns", Value, "seconddns_port", translate("Local Port"), translate("Smartdns local server port")) +o.placeholder = 7053 +o.default = 7053 +o.datatype = "port" +o.rempty = false + +---- Enable TCP server +o = s:taboption("seconddns", Flag, "seconddns_tcp_server", translate("TCP Server"), translate("Enable TCP DNS Server")) +o.rmempty = false +o.default = o.enabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "1" +end + +o = s:taboption("seconddns", Flag, "seconddns_no_speed_check", translate("Skip Speed Check"), translate("Do not check speed.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +---- dns server group +o = s:taboption("seconddns", Value, "seconddns_server_group", translate("Server Group"), translate("Query DNS through specific dns server group, such as office, home.")) +o.rmempty = true +o.placeholder = "default" +o.datatype = "hostname" +o.rempty = true + +---- skip address rules +o = s:taboption("seconddns", Flag, "seconddns_no_rule_addr", translate("Skip Address Rules"), translate("Skip address rules.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +---- skip name server rules +o = s:taboption("seconddns", Flag, "seconddns_no_rule_nameserver", translate("Skip Nameserver Rule"), translate("Skip nameserver rules.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +---- skip ipset rules +o = s:taboption("seconddns", Flag, "seconddns_no_rule_ipset", translate("Skip Ipset Rule"), translate("Skip ipset rules.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +---- skip soa address rule +o = s:taboption("seconddns", Flag, "seconddns_no_rule_soa", translate("Skip SOA Address Rule"), translate("Skip SOA address rules.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +o = s:taboption("seconddns", Flag, "seconddns_no_dualstack_selection", translate("Skip Dualstack Selection"), translate("Skip Sualstack Selection.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + +---- skip cache +o = s:taboption("seconddns", Flag, "seconddns_no_cache", translate("Skip Cache"), translate("Skip Cache.")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "0" +end + ----- custom settings custom = s:taboption("custom", Value, "Custom Settings", translate(""), diff --git a/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/upstream.lua b/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/upstream.lua index 0a05fd4bed..ad5f58040d 100644 --- a/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/upstream.lua +++ b/package/jsda/luci-app-smartdns/luasrc/model/cbi/smartdns/upstream.lua @@ -39,8 +39,16 @@ o:value("https", translate("https")) o.default = "udp" o.rempty = false +---- TLS host verify +o = s:option(Value, "tls_host_verify", translate("TLS Hostname Verify"), translate("Set TLS hostname to verify.")) +o.default = "" +o.datatype = "string" +o.rempty = true +o:depends("type", "tls") +o:depends("type", "https") + ---- SNI host name -o = s:option(Value, "host_name", translate("TLS SNI name"), translate("Sets the server name indication")) +o = s:option(Value, "host_name", translate("TLS SNI name"), translate("Sets the server name indication for query.")) o.default = "" o.datatype = "hostname" o.rempty = true @@ -55,7 +63,7 @@ o.rempty = true o:depends("type", "https") ---- server group -o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, used with nameserver, such as offlce, home.")) +o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, used with nameserver, such as office, home.")) o.rmempty = true o.placeholder = "default" o.datatype = "hostname" diff --git a/package/jsda/luci-app-smartdns/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo b/package/jsda/luci-app-smartdns/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo index 9370d8b86b..4c75b6c15f 100644 Binary files a/package/jsda/luci-app-smartdns/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo and b/package/jsda/luci-app-smartdns/root/usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo differ