From dbcf286d4c54068059d859b598f418a8e9fe9504 Mon Sep 17 00:00:00 2001
From: Paul Banks <banks@banksco.de>
Date: Thu, 10 May 2018 17:27:42 +0100
Subject: [PATCH] Ooops remove the CA stuff from actual server defaults and
 make it test server only

---
 agent/consul/config.go      | 9 ---------
 agent/consul/server_test.go | 5 +++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/agent/consul/config.go b/agent/consul/config.go
index 94c8bc06a..6f9410c4b 100644
--- a/agent/consul/config.go
+++ b/agent/consul/config.go
@@ -435,15 +435,6 @@ func DefaultConfig() *Config {
 
 		ServerHealthInterval: 2 * time.Second,
 		AutopilotInterval:    10 * time.Second,
-
-		CAConfig: &structs.CAConfiguration{
-			Provider: "consul",
-			Config: map[string]interface{}{
-				"PrivateKey":     "",
-				"RootCert":       "",
-				"RotationPeriod": 90 * 24 * time.Hour,
-			},
-		},
 	}
 
 	// Increase our reap interval to 3 days instead of 24h.
diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go
index 0359c847f..43dcd13ff 100644
--- a/agent/consul/server_test.go
+++ b/agent/consul/server_test.go
@@ -97,6 +97,11 @@ func testServerConfig(t *testing.T) (string, *Config) {
 	config.CAConfig = &structs.CAConfiguration{
 		ClusterID: connect.TestClusterID,
 		Provider:  structs.ConsulCAProvider,
+		Config: map[string]interface{}{
+			"PrivateKey":     "",
+			"RootCert":       "",
+			"RotationPeriod": 90 * 24 * time.Hour,
+		},
 	}
 
 	return dir, config