Browse Source

Add default CA config back - I didn't add it and causes nil panics

pull/4275/head
Paul Banks 7 years ago committed by Mitchell Hashimoto
parent
commit
f4b8e8c96d
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
  1. 9
      agent/consul/config.go
  2. 3
      agent/proxy/proxy_test.go

9
agent/consul/config.go

@ -433,6 +433,15 @@ func DefaultConfig() *Config {
ServerStabilizationTime: 10 * time.Second,
},
CAConfig: &structs.CAConfiguration{
Provider: "consul",
Config: map[string]interface{}{
"PrivateKey": "",
"RootCert": "",
"RotationPeriod": 90 * 24 * time.Hour,
},
},
ServerHealthInterval: 2 * time.Second,
AutopilotInterval: 10 * time.Second,
}

3
agent/proxy/proxy_test.go

@ -138,9 +138,6 @@ func TestHelperProcess(t *testing.T) {
time.Sleep(25 * time.Millisecond)
}
// Run forever
<-make(chan struct{})
case "output":
fmt.Fprintf(os.Stdout, "hello stdout\n")
fmt.Fprintf(os.Stderr, "hello stderr\n")

Loading…
Cancel
Save