Updated the spec definition for tls config

hashicorp · Oct 24, 2016 · e115f83 · e115f83
1 parent 15b2cc5
commit e115f83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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.<datacenter>.<domain>.

diff --git 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",