From 591bbe6da3ca5af3c82842f04beeaa3a51d54ab4 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 2 Nov 2019 23:06:35 +0800 Subject: [PATCH] smartdns: bump to v2019.11.02 --- package/jsda/luci-app-smartdns/Makefile | 2 + .../luasrc/model/cbi/smartdns/smartdns.lua | 83 ++++++++++++++++++ .../luasrc/model/cbi/smartdns/upstream.lua | 12 ++- .../usr/lib/lua/luci/i18n/smartdns.zh-cn.lmo | Bin 3556 -> 4368 bytes 4 files changed, 95 insertions(+), 2 deletions(-) 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 9370d8b86b79545f16aca418afbbec6bbf3dcac6..4c75b6c15f598c44a034746e15fa4ae579265b69 100644 GIT binary patch delta 1470 zcmZ{ie^AqP7{@=tetowgj({c#u~-H*1%rzWj`$%Nrbx~%3^NvtgOWyUC($@I3HjB? z;dhv$EkS4q(x4L*`5~OfVJRm?+7DS#?7NL$haI6DT+s7{VKdJ^cK5uV_wzjO=kt7L z-k^T6rH-PoHZ_?$RNLc)7F{_}RzqmdAY?h&OsEZny4k8Z^RPauEI7NNDoeA5Fce7A(lS!S0^f8= zrg+(5#Xyvrnk|+}ZS{pjiPmoVK+d5yUX&@8in9-kv+d>f`v2!0AE3y{l8R-k_4Wpb z9MnFrh_7%@l)qoVYQv*7M-$?h%2Hio?m9W9EM2{vJ@?dd(y=&2l#(vCFR~nih@Ym6 z2U)6X#u`=ob_vbxofcgOp)QA6#!J?2-)%yEQhFTi(Qi>_?>=Zy%f2e3P^2cCs_c{1}Le4OI0xEMXbokEDJ1YVD; zF)t^k8E?Y2c(NiPGuLd>5@JvcXiV}|MM4TR{)z%Id41+<;K!IweL z!tu!0d1{%m`ab>e_%VzjJMPO$GcFlFN#D(Sf{{q|&%#$m0 z!dAD+ix5Y`@36eIKCq~_eIuOV8(=TIm-XUaIu}CrrzTV1!K6?tw6cMD$2J8gJX(|oY2a%@S{4Z8=Cd?K~FTo%YrgI$-cKRZ|weq%bp87}UN3)nsi+AC1zs$Vk{ z#mQK_3vKIwX?jgG7BfVLnV1ror*F7YB_Zk>VWV*1$7&nCf35n5h4TolS^h8$lZMco z@;^I4ha;os8?SL9`eT>UA-)Q~wZ@RZ`B~@T3K%T_X0_%|-5I}a`x@a|Hc!EXOQEQ) z(q^xZ8`cHF4t!wtrHQ|~It2F?V23VX?{8glzw-HM5zb7RBlZ87!65m&9ZNQ=e$$)q zR8p4=brS2>*94sOV`6XVY{1}l_$s8|wp+Zt+v@avIz&g5I!L(TzAn$a!$^jZ zW4fOEp|s7K3;Pa|l4<&~dho*B-!Ll+nEAWbGhAvKhZD2*0n{of~Yb^3>MS` iV9&Y!J<|o5SS0WWu=nDA*^Jy8Yk@W38E6C8ANUu~$V3qU delta 657 zcmbQB^hA2Y5|+sxY%eA!uqzAB>3!O@@afDI!G4}kC-gpFzG3qk_6^LFYq+J@I3_SK zFo;iH!!5jdtvo=x-KGB9v@0L6F=^s5vvkT2nA^0;;JcX<{D2Bw(F7QAvyY%?ZD@Y*S{Isj$a5)VbR z_bg;{Vqjnf>E_I{uJ4%T>Uo!efo03&8@wt8h5BrKdrr;*I*WA$$hczJv$uS!&8Gl0 zn1J}z^>c!^2uF+D?%ktt(dN&AX7K>|iqldS^p@zWqyeq{ z1LX5hkL$2G|2}{jXsyZQ8+>wZEK5Mba~Ur?3TFQM2DC8;$Y+~7#fj7TGCLd4LqJ;@ z6c?|&7`Wil?`;eWj5mOMo>iv>?T)+t&j7Md05RX>9Dc1d4v=FV_jIn8YF;Uz4>YO) z$miMj`s1EmI^TZ-jk*Bj%bw(|Tq}3|AJDgKG9dX=?*CsrpQ{!Hln1#u|MK3aXRl73 zs|eJ80LYKN5^