vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3301 from yichengq/ca-file 

etcdmain: update -ca-file description
release-2.2
Yicheng Qin 2015-08-17 23:36:33 -07:00
parent bcb4d5d53e c0747a7b8b
commit 927d5f3d26
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/configuration.md
View File

@ -134,7 +134,7 @@ To start etcd automatically using custom settings at startup in Linux, using a [
The security flags help to [build a secure etcd cluster][security].
##### -ca-file [DEPRECATED]
+ Path to the client server TLS CA file.
+ Path to the client server TLS CA file. `-ca-file ca.crt` could be replaced by `-trusted-ca-file ca.crt -client-cert-auth` and etcd will perform the same.
+ default: none
##### -cert-file
@ -154,7 +154,7 @@ The security flags help to [build a secure etcd cluster][security].
+ default: none
##### -peer-ca-file [DEPRECATED]
+ Path to the peer server TLS CA file.
+ Path to the peer server TLS CA file. `-peer-ca-file ca.crt` could be replaced by `-peer-trusted-ca-file ca.crt -peer-client-cert-auth` and etcd will perform the same.
+ default: none
##### -peer-cert-file

4
etcdmain/help.go
View File

@ -87,7 +87,7 @@ proxy flags:
security flags:
--ca-file '' [DEPRECATED]
path to the client server TLS CA file.
path to the client server TLS CA file. '-ca-file ca.crt' could be replaced by '-trusted-ca-file ca.crt -client-cert-auth' and etcd will perform the same.
--cert-file ''
path to the client server TLS cert file.
--key-file ''
@ -97,7 +97,7 @@ security flags:
--trusted-ca-file ''
path to the client server TLS trusted CA key file.
--peer-ca-file '' [DEPRECATED]
path to the peer server TLS CA file.
path to the peer server TLS CA file. '-peer-ca-file ca.crt' could be replaced by '-peer-trusted-ca-file ca.crt -peer-client-cert-auth' and etcd will perform the same.
--peer-cert-file ''
path to the peer server TLS cert file.
--peer-key-file ''