From a75f42d629bc040b20bfae0286748013e004f823 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 27 Apr 2022 11:00:22 +0800 Subject: [PATCH 1/2] docs: add missing i18n trans and make spellcheck happy --- apps/emqx_authn/i18n/emqx_authn_jwt_i18n.conf | 2 +- apps/emqx_authn/i18n/emqx_authn_redis_i18n.conf | 4 ++-- apps/emqx_authz/i18n/emqx_authz_schema_i18n.conf | 13 ++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/emqx_authn/i18n/emqx_authn_jwt_i18n.conf b/apps/emqx_authn/i18n/emqx_authn_jwt_i18n.conf index 5c3568c25..2584c4e3c 100644 --- a/apps/emqx_authn/i18n/emqx_authn_jwt_i18n.conf +++ b/apps/emqx_authn/i18n/emqx_authn_jwt_i18n.conf @@ -122,7 +122,7 @@ emqx_authn_jwt { server_name_indication { desc { - en: """Server Name Indication (SNI), .""" + en: """Server Name Indication (SNI).""" zh: """服务器名称指示(SNI),未指定时将使用 endpoint 作为 SNI。""" } label { diff --git a/apps/emqx_authn/i18n/emqx_authn_redis_i18n.conf b/apps/emqx_authn/i18n/emqx_authn_redis_i18n.conf index fd24ed3d7..a9cd4a414 100644 --- a/apps/emqx_authn/i18n/emqx_authn_redis_i18n.conf +++ b/apps/emqx_authn/i18n/emqx_authn_redis_i18n.conf @@ -22,8 +22,8 @@ emqx_authn_redis { cmd { desc { - en: """The Redis Command used to query data for authentication such as password hash, currently only supports HGET and HMGET.""" - zh: """用于查询密码散列等用于认证的数据的 Redis Command,目前仅支持 HGET 与 HMGET。""" + en: """The Redis Command used to query data for authentication such as password hash, currently only supports HGET and HMGET.""" + zh: """用于查询密码散列等用于认证的数据的 Redis Command,目前仅支持 HGETHMGET。""" } label: { en: """Command""" diff --git a/apps/emqx_authz/i18n/emqx_authz_schema_i18n.conf b/apps/emqx_authz/i18n/emqx_authz_schema_i18n.conf index b08563267..ee7b15c6f 100644 --- a/apps/emqx_authz/i18n/emqx_authz_schema_i18n.conf +++ b/apps/emqx_authz/i18n/emqx_authz_schema_i18n.conf @@ -94,15 +94,22 @@ It is NOT allowed to configure two or more sources of the same type. path { desc { en: """ -Path to the file which contains the ACL rules.
+Path to the file which contains the ACL rules. If the file provisioned before starting EMQX node, it can be placed anywhere as long as EMQX has read access to it. -In case the rule-set is created from EMQX dashboard or management API, +In case the rule-set is created from EMQX Dashboard or management API, the file will be placed in `authz` subdirectory inside EMQX's `data_dir`, and the new rules will override all rules from the old config file. """ - zh: """""" + zh: """ +包含 ACL 规则的文件路径。 +如果在启动 EMQX 节点前预先配置该路径, +那么可以将该文件置于任何 EMQX 可以访问到的位置。 + +如果从 EMQX Dashboard 或 management API 创建规则集, +那么文件将会自动生成在 `authz` 目录下,该目录位于 EMQX 的 `data_dir` 子目录下, +并且之后新的规则集将会覆写旧文件。""" } label { en: """path""" From 1340c8e5534895d540062a7080137570f9cd9e31 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 27 Apr 2022 11:00:43 +0800 Subject: [PATCH 2/2] chore: fix typos in workflow file --- .github/workflows/run_broker_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_broker_tests.yaml b/.github/workflows/run_broker_tests.yaml index 3e4ffd82b..0b20a641e 100644 --- a/.github/workflows/run_broker_tests.yaml +++ b/.github/workflows/run_broker_tests.yaml @@ -127,7 +127,7 @@ jobs: name: jmeter_logs path: ./jmeter_logs - pgslq_authn_authz: + pgsql_authn_authz: runs-on: ubuntu-latest strategy: @@ -514,7 +514,7 @@ jobs: delete-artifact: runs-on: ubuntu-latest - needs: [advanced_feat,pgslq_authn_authz,JWT_authn,mysql_authn_authz,built_in_database_authn_authz] + needs: [advanced_feat,pgsql_authn_authz,JWT_authn,mysql_authn_authz,built_in_database_authn_authz] steps: - uses: geekyeggo/delete-artifact@v1 with: