zh,en: update tls config #228
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ireneontheway
added
status/PTAL
ireneontheway
added
translation/no-need
|
@ireneontheway,Thanks for your review. However, LGTM is restricted to Reviewers or higher roles.See the corresponding SIG page for more information. Related SIGs: docs(slack). |
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
|
BTW @GMHDBJD we also support to set TLS config for DM components, do we need to update docs too? |
|
Will add a TLS tutorials later. PTAL again. |
csuzhangxc
reviewed
Aug 14, 2020
en/dm-master-configuration-file.md
Outdated
Comment on lines
34
to
36
| ssl-ca: "/path/to/ca.pem" | ||
| ssl-cert: "/path/to/cert.pem" | ||
| ssl-key: "/path/to/key.pem" |
There was a problem hiding this comment.
the config format is TOML, not YAML here.
en/dm-worker-configuration-file.md
Outdated
Comment on lines
28
to
30
| ssl-ca: "/path/to/ca.pem" | ||
| ssl-cert: "/path/to/cert.pem" | ||
| ssl-key: "/path/to/key.pem" |
zh/dm-master-configuration-file.md
Outdated
Comment on lines
33
to
36
| ssl-ca: "/path/to/ca.pem" | ||
| ssl-cert: "/path/to/cert.pem" | ||
| ssl-key: "/path/to/key.pem" | ||
| cert-allowed-cn = ["dm"] |
zh/dm-worker-configuration-file.md
Outdated
Comment on lines
26
to
28
| ssl-ca: "/path/to/ca.pem" | ||
| ssl-cert: "/path/to/cert.pem" | ||
| ssl-key: "/path/to/key.pem" |
zh/dm-master-configuration-file.md
Outdated
| @@ -47,3 +51,7 @@ join = "" | |||
| | `advertise-peer-urls` | DM-master 向外界宣告的对等 URL。默认为 `peer-urls` 的值。| | |||
| | `initial-cluster` | 初始集群中所有 DM-master 的 `advertise-peer-urls` 的值。| | |||
| | `join` | 集群里已有的 DM-master 的 `advertise-peer-urls` 的值。如果是新加入的 DM-master 节点，使用 `join` 替代 `initial-cluster`。| | |||
| | `ssl-ca` | DM-master 组件 SSL CA 证书所在的路径 | | |||
| | `ssl-cert` | DM-master 组件用于连接的 PEM 格式的 X509 证书所在的路径 | | |||
This reverts commit c151589.
csuzhangxc
reviewed
Aug 14, 2020
en/dm-master-configuration-file.md
Outdated
| @@ -49,3 +54,7 @@ This section introduces the configuration parameters of DM-master. | |||
| | `advertise-peer-urls` | Specifies the peer URL that DM-master advertises to the outside world. The value of `advertise-peer-urls` is by default the same as that of `peer-urls`. | | |||
| | `initial-cluster` | The value of `initial-cluster` is the combination of the `advertise-peer-urls` value of all DM-master nodes in the initial cluster. | | |||
| | `join` | The value of `join` is the combination of the `advertise-peer-urls` value of the existed DM-master nodes in the cluster. If the DM-master node is newly added, replace `initial-cluster` with `join`. | | |||
| | `ssl-ca` | Path of file that contains list of trusted SSL CAs for connection with DM-master components. | | |||
There was a problem hiding this comment.
does English version need to update?
csuzhangxc
reviewed
Aug 15, 2020
zh/dm-worker-configuration-file.md
Outdated
| @@ -36,3 +41,7 @@ join = "127.0.0.1:8261,127.0.0.1:8361,127.0.0.1:8461" | |||
| | `worker-addr` | DM-worker 服务的地址，可以省略 IP 信息，例如：":8262"。| | |||
| | `advertise-addr` | DM-worker 向外界宣告的地址。 | | |||
| | `join` | 对应一个或多个 DM-master 配置中的 [`master-addr`](dm-master-configuration-file.md#global-配置)。 | | |||
| | `ssl-ca` | DM-worker 组件用于连接其它组件的 SSL CA 证书所在的路径 | | |||
|
@ireneontheway PTAL again? |
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
Co-authored-by: ireneontheway <48651140+ireneontheway@users.noreply.github.com>
|
@ireneontheway PTAL again, thx |
|
@ireneontheway,Thanks for your review. However, LGTM is restricted to Reviewers or higher roles.See the corresponding SIG page for more information. Related SIGs: docs(slack). |
|
@TomShawn two LGTM now, PTAL |
lilin90
added
translation/done
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is changed, added or deleted? (Required)
add tls config in source config file and task config file.
Which DM version(s) do your changes apply to? (Required)
What is the related PR or file link(s)?
Do your changes match any of the following descriptions?