Merge pull request #1331 from yuce/update-tls-config

Match TLSConfig to the docs
This commit is contained in:
Cody Soyland 2018-05-29 12:23:45 -05:00 committed by GitHub
commit 22d48deebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -31,9 +31,9 @@ const (
// TLSConfig contains TLS configuration
type TLSConfig struct {
// CertificatePath contains the path to the certificate (.crt or .pem file)
CertificatePath string `toml:"certificate-path"`
CertificatePath string `toml:"certificate"`
// CertificateKeyPath contains the path to the certificate key (.key file)
CertificateKeyPath string `toml:"certificate-key-path"`
CertificateKeyPath string `toml:"key"`
// SkipVerify disables verification for self-signed certificates
SkipVerify bool `toml:"skip-verify"`
}
@ -64,7 +64,7 @@ type Config struct {
}
// TLS
TLS TLSConfig
TLS TLSConfig `toml:"tls"`
Cluster struct {
// Disabled controls whether clustering functionality is enabled.