status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: update accepted CA config fields and defaults

This commit is contained in:
Kyle Havlovitz 2018-06-06 10:45:58 -07:00 committed by Jack Pearkes
parent 316bdbe010
commit edbeeeb23c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
agent/config/builder.go
View File

@ -534,6 +534,13 @@ func (b *Builder) Build() (rt RuntimeConfig, err error) {
connectEnabled = b.boolVal(c.Connect.Enabled) connectEnabled = b.boolVal(c.Connect.Enabled)
connectCAProvider = b.stringVal(c.Connect.CAProvider) connectCAProvider = b.stringVal(c.Connect.CAProvider)
connectCAConfig = c.Connect.CAConfig connectCAConfig = c.Connect.CAConfig
if c.Connect.CAConfig != nil {
TranslateKeys(connectCAConfig, map[string]string{
"private_key": "PrivateKey",
"root_cert": "RootCert",
"rotation_period": "RotationPeriod",
})
}
} }
proxyDefaultExecMode := "" proxyDefaultExecMode := ""

2
agent/consul/config.go
View File

@ -438,7 +438,7 @@ func DefaultConfig() *Config {
Config: map[string]interface{}{ Config: map[string]interface{}{
"PrivateKey": "", "PrivateKey": "",
"RootCert": "", "RootCert": "",
"RotationPeriod": 90 * 24 * time.Hour, "RotationPeriod": "2160h",
}, },
}, },