luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Renaming TLS related vault config

This commit is contained in:
Diptanu Choudhury 2016-11-03 14:24:39 -07:00
parent dd70e4e019
commit b6f9df5415
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/agent/config-test-fixtures/basic.hcl
View File

@ -115,10 +115,10 @@ vault {
task_token_ttl = "1s" task_token_ttl = "1s"
enabled = false enabled = false
token = "12345" token = "12345"
tls_ca_file = "/path/to/ca/file" ca_file = "/path/to/ca/file"
tls_ca_path = "/path/to/ca" ca_path = "/path/to/ca"
tls_cert_file = "/path/to/cert/file" cert_file = "/path/to/cert/file"
tls_key_file = "/path/to/key/file" key_file = "/path/to/key/file"
tls_server_name = "foobar" tls_server_name = "foobar"
tls_skip_verify = true tls_skip_verify = true
} }

8
command/agent/config_parse.go
View File

@ -704,10 +704,10 @@ func parseVaultConfig(result **config.VaultConfig, list *ast.ObjectList) error {
"allow_unauthenticated", "allow_unauthenticated",
"enabled", "enabled",
"task_token_ttl", "task_token_ttl",
"tls_ca_file", "ca_file",
"tls_ca_path", "ca_path",
"tls_cert_file", "cert_file",
"tls_key_file", "key_file",
"tls_server_name", "tls_server_name",
"tls_skip_verify", "tls_skip_verify",
"token", "token",

8
nomad/structs/config/vault.go
View File

@ -50,17 +50,17 @@ type VaultConfig struct {
// TLSCaFile is the path to a PEM-encoded CA cert file to use to verify the // TLSCaFile is the path to a PEM-encoded CA cert file to use to verify the
// Vault server SSL certificate. // Vault server SSL certificate.
TLSCaFile string `mapstructure:"tls_ca_file"` TLSCaFile string `mapstructure:"ca_file"`
// TLSCaFile is the path to a directory of PEM-encoded CA cert files to // TLSCaFile is the path to a directory of PEM-encoded CA cert files to
// verify the Vault server SSL certificate. // verify the Vault server SSL certificate.
TLSCaPath string `mapstructure:"tls_ca_path"` TLSCaPath string `mapstructure:"ca_path"`
// TLSCertFile is the path to the certificate for Vault communication // TLSCertFile is the path to the certificate for Vault communication
TLSCertFile string `mapstructure:"tls_cert_file"` TLSCertFile string `mapstructure:"cert_file"`
// TLSKeyFile is the path to the private key for Vault communication // TLSKeyFile is the path to the private key for Vault communication
TLSKeyFile string `mapstructure:"tls_key_file"` TLSKeyFile string `mapstructure:"key_file"`
// TLSSkipVerify enables or disables SSL verification // TLSSkipVerify enables or disables SSL verification
TLSSkipVerify *bool `mapstructure:"tls_skip_verify"` TLSSkipVerify *bool `mapstructure:"tls_skip_verify"`