From fb5b089740cf3961c7658a5e190770abb5a7a90e Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Tue, 21 Nov 2023 21:36:55 +0800 Subject: [PATCH] luci-compat: update. --- .../files/luci/i18n/smartdns.zh-cn.po | 78 ++++++++++++++++++- .../luci/model/cbi/smartdns/smartdns.lua | 68 +++++++++++++++- 2 files changed, 141 insertions(+), 5 deletions(-) diff --git a/package/luci-compat/files/luci/i18n/smartdns.zh-cn.po b/package/luci-compat/files/luci/i18n/smartdns.zh-cn.po index f44bf09..db393b6 100644 --- a/package/luci-compat/files/luci/i18n/smartdns.zh-cn.po +++ b/package/luci-compat/files/luci/i18n/smartdns.zh-cn.po @@ -67,6 +67,18 @@ msgstr "配置分流域名列表" msgid "Custom Settings" msgstr "自定义设置" +msgid "DOH Server" +msgstr "DOH服务器" + +msgid "DOH Server Port" +msgstr "DOH服务器端口" + +msgid "DOT Server" +msgstr "DOT服务器" + +msgid "DOT Server Port" +msgstr "DOT服务器端口" + msgid "DNS Block Setting" msgstr "域名屏蔽设置" @@ -184,8 +196,44 @@ msgstr "启用IPV6服务器。" msgid "Enable TCP DNS Server" msgstr "启用TCP服务器。" -msgid "Enable daily auto update." -msgstr "启用每日自动更新" +msgid "Enable daily(week) auto update." +msgstr "启用每天（每周）自动更新。" + +msgid "Enable DOH DNS Server" +msgstr "启用DOH服务器。" + +msgid "Enable DOT DNS Server" +msgstr "启用DOT服务器。" + +msgid "Update Time (Every Week)" +msgstr "更新时间(每周)" + +msgid "Every Day" +msgstr "每天" + +msgid "Every Monday" +msgstr "每周一" + +msgid "Every Tuesday" +msgstr "每周二" + +msgid "Every Wednesday" +msgstr "每周三" + +msgid "Every Thursday" +msgstr "每周四" + +msgid "Every Friday" +msgstr "每周五" + +msgid "Every Saturday" +msgstr "每周六" + +msgid "Every Sunday" +msgstr "每周日" + +msgid "Update Time (Every Day)" +msgstr "更新时间(每天)" msgid "Enable domain prefetch, accelerate domain response speed." msgstr "启用域名预加载，加速域名响应速度。" @@ -398,6 +446,15 @@ msgstr "重启服务" msgid "Second Server Settings" msgstr "第二DNS服务器" +msgid "Server certificate file path." +msgstr "服务器证书文件路径。" + +msgid "Server certificate key file path." +msgstr "服务器证书私钥文件路径。" + +msgid "Server certificate key file password." +msgstr "服务器证书私钥文件密码。" + msgid "Serve expired" msgstr "缓存过期服务" @@ -410,6 +467,15 @@ msgstr "服务器组%s不存在" msgid "Server Name" msgstr "服务器名称" +msgid "Server Cert" +msgstr "服务器证书" + +msgid "Server Cert Key" +msgstr "服务器证书私钥" + +msgid "Server Cert Key Pass" +msgstr "服务器证书私钥密码" + msgid "Set Specific domain ip address." msgstr "设置指定域名的IP地址。" @@ -478,6 +544,12 @@ msgstr "跳过Nameserver规则。" msgid "SmartDNS" msgstr "SmartDNS" +msgid "Smartdns DOH server port." +msgstr "Smartdns DOH服务器端口号。 + +msgid "Smartdns DOT server port." +msgstr "Smartdns DOT服务器端口号。" + msgid "SmartDNS Server" msgstr "SmartDNS 服务器" @@ -648,4 +720,4 @@ msgid "type" msgstr "类型" msgid "udp" -msgstr "udp" +msgstr "udp" \ No newline at end of file diff --git a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua index 373a42a..b6248e7 100644 --- a/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua +++ b/package/luci-compat/files/luci/model/cbi/smartdns/smartdns.lua @@ -130,6 +130,56 @@ o.cfgvalue = function(...) return Flag.cfgvalue(...) or "1" end +---- Enable DOT server; +o = s:taboption("advanced", Flag, "tls_server", translate("DOT Server"), translate("Enable DOT DNS Server")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "1" +end + +o = s:taboption("advanced", Value, "tls_server_port", translate("DOT Server Port"), translate("Smartdns DOT server port.")) +o.placeholder = 853 +o.default = 853 +o.datatype = "port" +o.rempty = false +o:depends('tls_server', '1') + +---- Enable DOH server; +o = s:taboption("advanced", Flag, "doh_server", translate("DOH Server"), translate("Enable DOH DNS Server")) +o.rmempty = false +o.default = o.disabled +o.cfgvalue = function(...) + return Flag.cfgvalue(...) or "1" +end + +o = s:taboption("advanced", Value, "doh_server_port", translate("DOH Server Port"), translate("Smartdns DOH server port.")) +o.placeholder = 843 +o.default = 843 +o.datatype = "port" +o.rempty = false +o:depends('doh_server', '1') + +o = s:taboption("advanced", Value, "bind_cert", translate("Server Cert"), translate("Server certificate file path.")) +o.datatype = "string" +o.placeholder = "/var/etc/smartdns/smartdns/smartdns-cert.pem" +o.rempty = true +o:depends('tls_server', '1') +o:depends('doh_server', '1') + +o = s:taboption("advanced", Value, "bind_cert_key", translate("Server Cert Key"), translate("Server certificate key file path.")) +o.datatype = "string" +o.placeholder = "/var/etc/smartdns/smartdns/smartdns-key.pem" +o.rempty = false +o:depends('tls_server', '1') +o:depends('doh_server', '1') + +o = s:taboption("advanced", Value, "bind_cert_key_pass", translate("Server Cert Key Pass"), translate("Server certificate key file password.")) +o.datatype = "string" +o.rempty = false +o:depends('tls_server', '1') +o:depends('doh_server', '1') + ---- Support IPV6 o = s:taboption("advanced", Flag, "ipv6_server", translate("IPV6 Server"), translate("Enable IPV6 DNS Server")) o.rmempty = false @@ -671,11 +721,26 @@ s = m:section(TypedSection, "smartdns", translate("Download Files Setting"), tra s.anonymous = true ---- download Files Settings -o = s:option(Flag, "enable_auto_update", translate("Enable Auto Update"), translate("Enable daily auto update.")) +o = s:option(Flag, "enable_auto_update", translate("Enable Auto Update"), translate("Enable daily(week) auto update.")) o.rmempty = true o.default = o.disabled o.rempty = true +o = s:option(ListValue, "auto_update_week_time", translate("Update Time (Every Week)")) +o:value("*", translate("Every Day")) +o:value("1", translate("Every Monday")) +o:value("2", translate("Every Tuesday")) +o:value("3", translate("Every Wednesday")) +o:value("4", translate("Every Thursday")) +o:value("5", translate("Every Friday")) +o:value("6", translate("Every Saturday")) +o:value("0", translate("Every Sunday")) +o.default = "*" + +o = s:option(ListValue, "auto_update_day_time", translate("Update Time (Every Day)")) +for i = 0, 23 do o:value(i, i .. ":00") end +o.default = 5 + o = s:option(FileUpload, "upload_conf_file", translate("Upload Config File"), translate("Upload smartdns config file to /etc/smartdns/conf.d")) o.rmempty = true @@ -780,4 +845,3 @@ o.write = function() end return m -