Merge pull request #6415 from stokito/acme

Update luci-app-acme to work with the updated acme client, and rework the UI some as well.

1 files changed, 131 insertions, 82 deletions

diff --git a/applications/luci-app-acme/po/zh_Hans/acme.po b/applications/luci-app-acme/po/zh_Hans/acme.po
index ed98da210a..ba9aa049f6 100644
--- a/applications/luci-app-acme/po/zh_Hans/acme.po
+++ b/applications/luci-app-acme/po/zh_Hans/acme.po
@@ -10,75 +10,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Weblate 4.10-dev\n"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:17
-msgid "ACME certificates"
-msgstr "ACME 证书"
-
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:25
 #: applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json:3
-msgid "ACME certs"
+msgid "ACME certificates"
 msgstr "ACME 证书"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:36
 msgid "ACME global config"
 msgstr "ACME 全局配置"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:144
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:514
 msgid "ACME server URL"
 msgstr "ACME 服务器 URL"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:29
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:39
 msgid "Account email"
 msgstr "电子邮件帐户"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:44
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:37
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:433
+msgid "Base64 content of private key. Use instead of YC_SA_Key_File_Path"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:33
+msgid "Cert files are stored in"
+msgstr "存放证书和其他状态文件的位置。"
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
 msgid "Certificate config"
 msgstr "证书配置"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:124
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:605
+msgid "Certificates"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:452
 msgid "Challenge Alias"
 msgstr "质询别名"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:43
-msgid "Challenge Validation"
-msgstr "质询验证"
-
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:509
 msgid "Custom ACME CA"
 msgstr "自定义 ACME 证书颁发机构"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:145
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:515
 msgid "Custom ACME server directory URL."
 msgstr "自定义 ACME 服务器目录 URL。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:96
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:74
 msgid "DNS"
 msgstr "DNS"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:107
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:87
 msgid "DNS API"
 msgstr "DNS API"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:116
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:444
 msgid "DNS API credentials"
 msgstr "DNS API 凭证"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:151
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+msgid "DNS Challenge Validation"
+msgstr "DNS 质询验证"
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:521
 msgid "Days until renewal"
 msgstr "续约前天数"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:131
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
+msgid "Default"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:459
 msgid "Domain Alias"
 msgstr "域名别名"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:65
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:62
 msgid "Domain names"
 msgstr "域名"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:66
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:63
 msgid ""
 "Domain names to include in the certificate. The first name will be the "
 "subject name, subsequent names will be alt names. Note that all domain names "
@@ -87,31 +100,37 @@ msgstr ""
 "证书中要包含的域名。第一个名字将是主题名，后面的名字将是主题备用名称。请注"
 "意，所有域名都必须在路由中指向全局 DNS。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:60
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:410
+msgid ""
+"E.g. <code>_acme-challenge.example.com:12345:98765 alias.example.com:11111</"
+"code>"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:482
 msgid "ECC 256 bits"
 msgstr "ECC 256 位"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:61
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:483
 msgid "ECC 384 bits"
 msgstr "ECC 384 位"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:30
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:40
 msgid "Email address to associate with account key."
 msgstr "与帐户密钥关联的电子邮件地址。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:34
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
 msgid "Enable debug logging"
 msgstr "启用调试日志记录"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:46
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
 msgid "Enabled"
 msgstr "已启用"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:42
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:54
 msgid "General Settings"
 msgstr "常规设置"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:50
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:469
 msgid ""
 "Get certificate from the Letsencrypt staging server (use for testing; the "
 "certificate won't be valid)."
@@ -121,31 +140,78 @@ msgstr "从 Letsencrypt 临时服务器获取证书(用于测试;证书无效)�
 msgid "Grant UCI access for luci-app-acme"
 msgstr "为 luci-app-acme 授予 UCI 的访问权限"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
-msgid "Key size"
-msgstr "密钥长度"
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:41
+msgid ""
+"If a certificate wasn't renewed in time then you'll receive a notice at 20 "
+"days before expiry."
+msgstr ""
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:56
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:587
+msgid "Issued on"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:477
 msgid "Key size (and type) for the generated certificate."
 msgstr "生成的证书的密钥长度(和类型)。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:57
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:476
+msgid "Key type"
+msgstr "密钥长度"
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:584
+msgid "Main Domain"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:369
+msgid "OCID of tenancy that contains the target DNS zone"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:372
+msgid "OCID of user with permission to add/remove records from zones"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:275
+msgid ""
+"Open <a href=\"https://www.duckdns.org/\">DuckDNS</a> and copy a token here"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:378
+msgid "Path to private API signing key file in PEM format"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:585
+msgid "Private Key"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:586
+msgid "Public Certificate"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:479
 msgid "RSA 2048 bits"
 msgstr "RSA 2048 位"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:58
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:480
 msgid "RSA 3072 bits"
 msgstr "RSA 3072 位"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:59
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:481
 msgid "RSA 4096 bits"
 msgstr "RSA 4096 位"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:94
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:236
+msgid "See instructions"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:375
+msgid "Should point to the tenancy home region"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:72
 msgid "Standalone"
 msgstr "独立"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:91
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:69
 msgid ""
 "Standalone mode will use the built-in webserver of acme.sh to issue a "
 "certificate. Webroot mode will use an existing webserver to issue a "
@@ -155,7 +221,7 @@ msgstr ""
 "独立模式将使用 acme.sh 的内置 Web 服务器来颁发证书。Webroot 模式将使用现有的 "
 "Web 服务器来颁发证书。DNS 模式将允许您使用 DNS 提供商的 DNS API 颁发证书。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:125
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:453
 msgid ""
 "The challenge alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -165,7 +231,7 @@ msgstr ""
 "https://github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode。LUCI 每个证书"
 "只支持一个质询别名。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:117
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:445
 msgid ""
 "The credentials for the DNS API mode selected above. See https://github.com/"
 "acmesh-official/acme.sh/wiki/dnsapi for the format of credentials required "
@@ -176,7 +242,7 @@ msgstr ""
 "acme.sh/wiki/dnsapi 以了解每个 API 所需的凭据格式。在此处以 KEY=VAL shell 变"
 "量格式添加多个条目，以提供多个凭据变量。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:132
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:460
 msgid ""
 "The domain alias to use for ALL domains. See https://github.com/acmesh-"
 "official/acme.sh/wiki/DNS-alias-mode for the details of this process. LUCI "
@@ -186,7 +252,11 @@ msgstr ""
 "github.com/acmesh-official/acme.sh/wiki/DNS-alias-mode。LUCI 每个证书只支持一"
 "个质询别名。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:18
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:381
+msgid "The private API signing key in PEM format"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:26
 msgid ""
 "This configures ACME (Letsencrypt) automatic certificate installation. "
 "Simply fill out this to have the router configured with Letsencrypt-issued "
@@ -200,7 +270,11 @@ msgstr ""
 "的公网 IP 地址。配置完成后，颁发证书可能需要一段时间。从日志中查看签署进度和"
 "错误。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:108
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:297
+msgid "This is usually NOT an email address"
+msgstr ""
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:88
 msgid ""
 "To use DNS mode to issue certificates, set this to the name of a DNS API "
 "supported by acme.sh. See https://github.com/acmesh-official/acme.sh/wiki/"
@@ -214,53 +288,31 @@ msgstr ""
 "dnsapi。在 DNS 模式下，域名不必解析为路由器IP。DNS 模式也是唯一支持通配符证书"
 "的模式。使用此模式需要安装 acme-dnsapi 包。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:82
-msgid ""
-"Update the nginx config with this certificate once issued (only select this "
-"for one certificate). Nginx must support ssl, if not it won't start as it "
-"needs to be compiled with ssl support to use cert options"
-msgstr ""
-"颁发此证书后，用该证书更新 nginx 配置（只能有一个证书配置选中该选项）。Nginx "
-"必须支持 ssl，如果无法启动，则必须使用ssl支持进行编译才能使用证书选项"
-
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
-msgid ""
-"Update the uhttpd config with this certificate once issued (only select this "
-"for one certificate). Is also available luci-app-uhttpd to configure uhttpd "
-"form the LuCI interface."
-msgstr ""
-"签发此证书后，使用此证书更新 uhttpd 配置（只能有一个证书配置选中该选项）。也"
-"可通过 LuCI 界面的 luci-app-uhttpd 来配置 uhttpd。"
-
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:139
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:509
 msgid "Use a custom CA instead of Let's Encrypt."
 msgstr "使用自定义证书颁发机构代替 Let's Encrypt。"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:81
-msgid "Use for nginx"
-msgstr "用于 Nginx"
-
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:72
-msgid "Use for uhttpd"
-msgstr "用于 uhttpd"
-
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:49
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:467
 msgid "Use staging server"
 msgstr "使用临时服务器"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:90
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:68
 msgid "Validation method"
 msgstr "验证方式"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:95
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:73
 msgid "Webroot"
 msgstr "Webroot"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:99
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:55
+msgid "Webroot Challenge Validation"
+msgstr "Webroot 质询验证"
+
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:77
 msgid "Webroot directory"
 msgstr "Webroot 文件夹"
 
-#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:100
+#: applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js:78
 msgid ""
 "Webserver root directory. Set this to the webserver document root to run "
 "Acme in webroot mode. The web server must be accessible from the internet on "
@@ -269,11 +321,8 @@ msgstr ""
 "Webserver 根目录。设置为 Web 服务器文档根目录，在 webroot 模式下运行 Acme。"
 "Web 服务器必须允许从互联网上使用80端口访问。"
 
-#~ msgid "State directory"
-#~ msgstr "状态文件夹"
-
-#~ msgid "Where certs and other state files are kept."
-#~ msgstr "存放证书和其他状态文件的位置。"
+#~ msgid "ACME certs"
+#~ msgstr "ACME 证书"
 
 #~ msgid ""
 #~ "The credentials for the DNS API mode selected above. See https://github."