Преглед на файлове

Merge pull request #3301 from yichengq/ca-file

etcdmain: update -ca-file description
Yicheng Qin преди 10 години
родител
ревизия
927d5f3d26
променени са 2 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      Documentation/configuration.md
  2. 2 2
      etcdmain/help.go

+ 2 - 2
Documentation/configuration.md

@@ -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].
 The security flags help to [build a secure etcd cluster][security].
 
 
 ##### -ca-file [DEPRECATED]
 ##### -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
 + default: none
 
 
 ##### -cert-file
 ##### -cert-file
@@ -154,7 +154,7 @@ The security flags help to [build a secure etcd cluster][security].
 + default: none
 + default: none
 
 
 ##### -peer-ca-file [DEPRECATED]
 ##### -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
 + default: none
 
 
 ##### -peer-cert-file
 ##### -peer-cert-file

+ 2 - 2
etcdmain/help.go

@@ -87,7 +87,7 @@ proxy flags:
 security flags:
 security flags:
 
 
 	--ca-file '' [DEPRECATED]
 	--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 ''
 	--cert-file ''
 		path to the client server TLS cert file.
 		path to the client server TLS cert file.
 	--key-file ''
 	--key-file ''
@@ -97,7 +97,7 @@ security flags:
 	--trusted-ca-file ''
 	--trusted-ca-file ''
 		path to the client server TLS trusted CA key file.
 		path to the client server TLS trusted CA key file.
 	--peer-ca-file '' [DEPRECATED]
 	--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 ''
 	--peer-cert-file ''
 		path to the peer server TLS cert file.
 		path to the peer server TLS cert file.
 	--peer-key-file ''
 	--peer-key-file ''