From 44fe463f3403aca3665495553702a06f8a82e55b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 09:17:35 +0800
Subject: [PATCH] update 2023-11-21 09:17:35

---
 .../luasrc/model/cbi/smartdns/smartdns.lua    | 50 +++++++++++++++++++
 luci-app-smartdns/po/zh-cn/smartdns.po        | 44 +++++++++++++++-
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua b/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua
index 0b94976c8..b56e096d1 100644
--- a/luci-app-smartdns/luasrc/model/cbi/smartdns/smartdns.lua
+++ b/luci-app-smartdns/luasrc/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
diff --git a/luci-app-smartdns/po/zh-cn/smartdns.po b/luci-app-smartdns/po/zh-cn/smartdns.po
index 05e367e33..4bda0166b 100644
--- a/luci-app-smartdns/po/zh-cn/smartdns.po
+++ b/luci-app-smartdns/po/zh-cn/smartdns.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 "域名屏蔽设置"
 
@@ -185,7 +197,13 @@ msgid "Enable TCP DNS Server"
 msgstr "启用TCP服务器。"
 
 msgid "Enable daily(week) auto update."
-msgstr "启用每天（每周）自动更新"
+msgstr "启用每天（每周）自动更新。"
+
+msgid "Enable DOH DNS Server"
+msgstr "启用DOH服务器。"
+
+msgid "Enable DOT DNS Server"
+msgstr "启用DOT服务器。"
 
 msgid "Update Time (Every Week)"
 msgstr "更新时间(每周)"
@@ -428,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 "缓存过期服务"
 
@@ -440,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地址。"
 
@@ -508,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 服务器"