Merge pull request #8893 from dahefanteng/fix-typo
Documentation: change "key file" to "cert file"release-3.3 v3.2.10_plus_git
commit
15bfc1b361
|
@ -248,7 +248,7 @@ The security flags help to [build a secure etcd cluster][security].
|
||||||
+ env variable: ETCD_CLIENT_CRL_FILE
|
+ env variable: ETCD_CLIENT_CRL_FILE
|
||||||
|
|
||||||
### --trusted-ca-file
|
### --trusted-ca-file
|
||||||
+ Path to the client server TLS trusted CA key file.
|
+ Path to the client server TLS trusted CA cert file.
|
||||||
+ default: ""
|
+ default: ""
|
||||||
+ env variable: ETCD_TRUSTED_CA_FILE
|
+ env variable: ETCD_TRUSTED_CA_FILE
|
||||||
|
|
||||||
|
|
|
@ -205,7 +205,7 @@ The security flags help to [build a secure etcd cluster][security].
|
||||||
+ env variable: ETCD_CLIENT_CERT_AUTH
|
+ env variable: ETCD_CLIENT_CERT_AUTH
|
||||||
|
|
||||||
### --trusted-ca-file
|
### --trusted-ca-file
|
||||||
+ Path to the client server TLS trusted CA key file.
|
+ Path to the client server TLS trusted CA cert file.
|
||||||
+ default: none
|
+ default: none
|
||||||
+ env variable: ETCD_TRUSTED_CA_FILE
|
+ env variable: ETCD_TRUSTED_CA_FILE
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ client-transport-security:
|
||||||
# Enable client cert authentication.
|
# Enable client cert authentication.
|
||||||
client-cert-auth: false
|
client-cert-auth: false
|
||||||
|
|
||||||
# Path to the client server TLS trusted CA key file.
|
# Path to the client server TLS trusted CA cert file.
|
||||||
trusted-ca-file:
|
trusted-ca-file:
|
||||||
|
|
||||||
# Client TLS using generated certificates
|
# Client TLS using generated certificates
|
||||||
|
@ -125,7 +125,7 @@ peer-transport-security:
|
||||||
# Enable peer client cert authentication.
|
# Enable peer client cert authentication.
|
||||||
peer-client-cert-auth: false
|
peer-client-cert-auth: false
|
||||||
|
|
||||||
# Path to the peer server TLS trusted CA key file.
|
# Path to the peer server TLS trusted CA cert file.
|
||||||
trusted-ca-file:
|
trusted-ca-file:
|
||||||
|
|
||||||
# Peer TLS using generated certificates.
|
# Peer TLS using generated certificates.
|
||||||
|
|
|
@ -178,7 +178,7 @@ func newConfig() *config {
|
||||||
fs.StringVar(&cfg.ec.ClientTLSInfo.KeyFile, "key-file", "", "Path to the client server TLS key file.")
|
fs.StringVar(&cfg.ec.ClientTLSInfo.KeyFile, "key-file", "", "Path to the client server TLS key file.")
|
||||||
fs.BoolVar(&cfg.ec.ClientTLSInfo.ClientCertAuth, "client-cert-auth", false, "Enable client cert authentication.")
|
fs.BoolVar(&cfg.ec.ClientTLSInfo.ClientCertAuth, "client-cert-auth", false, "Enable client cert authentication.")
|
||||||
fs.StringVar(&cfg.ec.ClientTLSInfo.CRLFile, "client-crl-file", "", "Path to the client certificate revocation list file.")
|
fs.StringVar(&cfg.ec.ClientTLSInfo.CRLFile, "client-crl-file", "", "Path to the client certificate revocation list file.")
|
||||||
fs.StringVar(&cfg.ec.ClientTLSInfo.TrustedCAFile, "trusted-ca-file", "", "Path to the client server TLS trusted CA key file.")
|
fs.StringVar(&cfg.ec.ClientTLSInfo.TrustedCAFile, "trusted-ca-file", "", "Path to the client server TLS trusted CA cert file.")
|
||||||
fs.BoolVar(&cfg.ec.ClientAutoTLS, "auto-tls", false, "Client TLS using generated certificates")
|
fs.BoolVar(&cfg.ec.ClientAutoTLS, "auto-tls", false, "Client TLS using generated certificates")
|
||||||
fs.StringVar(&cfg.ec.PeerTLSInfo.CAFile, "peer-ca-file", "", "DEPRECATED: Path to the peer server TLS CA file.")
|
fs.StringVar(&cfg.ec.PeerTLSInfo.CAFile, "peer-ca-file", "", "DEPRECATED: Path to the peer server TLS CA file.")
|
||||||
fs.StringVar(&cfg.ec.PeerTLSInfo.CertFile, "peer-cert-file", "", "Path to the peer server TLS cert file.")
|
fs.StringVar(&cfg.ec.PeerTLSInfo.CertFile, "peer-cert-file", "", "Path to the peer server TLS cert file.")
|
||||||
|
|
|
@ -139,7 +139,7 @@ security flags:
|
||||||
--client-crl-file ''
|
--client-crl-file ''
|
||||||
path to the client certificate revocation list file.
|
path to the client certificate revocation list file.
|
||||||
--trusted-ca-file ''
|
--trusted-ca-file ''
|
||||||
path to the client server TLS trusted CA key file.
|
path to the client server TLS trusted CA cert file.
|
||||||
--auto-tls 'false'
|
--auto-tls 'false'
|
||||||
client TLS using generated certificates.
|
client TLS using generated certificates.
|
||||||
--peer-ca-file '' [DEPRECATED]
|
--peer-ca-file '' [DEPRECATED]
|
||||||
|
|
Loading…
Reference in New Issue