github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ooops remove the CA stuff from actual server defaults and make it test server only

pull/4275/head
Paul Banks 2018-05-10 17:27:42 +01:00 committed by Mitchell Hashimoto
parent 7c7c858a9a
commit 1228a5839a
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/consul/config.go
View File

@ -435,15 +435,6 @@ func DefaultConfig() *Config {
ServerHealthInterval: 2 * time.Second, ServerHealthInterval: 2 * time.Second,
AutopilotInterval: 10 * 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. // Increase our reap interval to 3 days instead of 24h.

5
agent/consul/server_test.go
View File

@ -97,6 +97,11 @@ func testServerConfig(t *testing.T) (string, *Config) {
config.CAConfig = &structs.CAConfiguration{ config.CAConfig = &structs.CAConfiguration{
ClusterID: connect.TestClusterID, ClusterID: connect.TestClusterID,
Provider: structs.ConsulCAProvider, Provider: structs.ConsulCAProvider,
Config: map[string]interface{}{
"PrivateKey": "",
"RootCert": "",
"RotationPeriod": 90 * 24 * time.Hour,
},
} }
return dir, config return dir, config