-
Notifications
You must be signed in to change notification settings - Fork 63
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
zh,en: update tls config #228
Merged
Merged
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
8f8bbf6
zh,en: update tls config
GMHDBJD b83463a
Update en/task-configuration-file-full.md
GMHDBJD 8bd479e
zh,en: add tls config for master and worker
GMHDBJD 7d9c532
fix fmt
GMHDBJD c151589
address comment
GMHDBJD 87ff258
Revert "address comment"
GMHDBJD 5931e08
address comment
GMHDBJD d5dc904
address comment
GMHDBJD 5adf840
address comment
GMHDBJD 65759f8
Update en/dm-master-configuration-file.md
GMHDBJD 8c2f41c
Update en/dm-worker-configuration-file.md
GMHDBJD e89dfc5
Update en/dm-worker-configuration-file.md
GMHDBJD 8fbe6ca
Update en/dm-worker-configuration-file.md
GMHDBJD 6143955
Update en/task-configuration-file-full.md
GMHDBJD 34ed33e
Update en/source-configuration-file.md
GMHDBJD fef0cff
Update en/dm-master-configuration-file.md
GMHDBJD 0a80950
Update en/dm-master-configuration-file.md
GMHDBJD 6654ac7
Merge branch 'master' into TLSConfig
GMHDBJD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,11 @@ log-file = "dm-worker.log" | |
worker-addr = ":8262" | ||
advertise-addr = "127.0.0.1:8262" | ||
join = "127.0.0.1:8261,127.0.0.1:8361,127.0.0.1:8461" | ||
|
||
ssl-ca = "/path/to/ca.pem" | ||
ssl-cert = "/path/to/cert.pem" | ||
ssl-key = "/path/to/key.pem" | ||
cert-allowed-cn = ["dm"] | ||
``` | ||
|
||
## 配置项说明 | ||
|
@@ -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 证书所在的路径 | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 哦,好像它们自己也还用这个参数来监听连接 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 稍微改了一下 |
||
| `ssl-cert` | DM-worker 组件用于连接其它组件的 PEM 格式的 X509 证书所在的路径 | | ||
| `ssl-key` | DM-worker 组件用于连接其它组件的 PEM 格式的 X509 密钥所在的路径 | | ||
| `cert-allowed-cn` | 证书检查 Common Name 列表 | |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does English version need to update?