luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

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

This commit is contained in:
Paul Banks 2018-05-12 09:48:16 +01:00 committed by Mitchell Hashimoto
parent dbcf286d4c
commit bd5eb8b749
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/consul/config.go
View File

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

3
agent/proxy/proxy_test.go
View File

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