From e115f83ded2a8748c4eabcb94917b8e307b70353 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Mon, 24 Oct 2016 15:36:26 -0700 Subject: [PATCH] Updated the spec definition for tls config --- command/agent/config-test-fixtures/basic.hcl | 4 ++-- command/agent/config.go | 4 ++-- command/agent/config_parse.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/command/agent/config-test-fixtures/basic.hcl b/command/agent/config-test-fixtures/basic.hcl index 602a0011c..bce114fd8 100644 --- a/command/agent/config-test-fixtures/basic.hcl +++ b/command/agent/config-test-fixtures/basic.hcl @@ -122,8 +122,8 @@ vault { tls_skip_verify = true } tls { - http_tls = true - rpc_tls = true + enable_http = true + enable_rpc = true verify_server_hostname = true ca_file = "foo" cert_file = "bar" diff --git a/command/agent/config.go b/command/agent/config.go index 7cfbcf053..3791cc819 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -143,10 +143,10 @@ type AtlasConfig struct { type TLSConfig struct { // EnableHTTP enabled TLS for http traffic to the Nomad server and clients - EnableHTTP bool `mapstructure:"http_tls"` + EnableHTTP bool `mapstructure:"enable_http"` // EnableRPC enables TLS for RPC and Raft traffic to the Nomad servers - EnableRPC bool `mapstructure:"rpc_tls"` + EnableRPC bool `mapstructure:"enable_rpc"` // VerifyServerHostname is used to enable hostname verification of servers. This // ensures that the certificate presented is valid for server... diff --git a/command/agent/config_parse.go b/command/agent/config_parse.go index 3850831b7..e1fd5049c 100644 --- a/command/agent/config_parse.go +++ b/command/agent/config_parse.go @@ -662,8 +662,8 @@ func parseTLSConfig(result **TLSConfig, list *ast.ObjectList) error { listVal := list.Items[0].Val valid := []string{ - "http_tls", - "rpc_tls", + "enable_http", + "enable_rpc", "verify_server_hostname", "ca_file", "cert_file",