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

agent: copy config into consul config

This commit is contained in:
Armon Dadgar 2015-05-11 15:16:13 -07:00
parent 9642384429
commit 1952083354
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/agent.go
View File

@ -288,10 +288,12 @@ func (a *Agent) consulConfig() *consul.Config {
// Copy the TLS configuration // Copy the TLS configuration
base.VerifyIncoming = a.config.VerifyIncoming base.VerifyIncoming = a.config.VerifyIncoming
base.VerifyOutgoing = a.config.VerifyOutgoing base.VerifyOutgoing = a.config.VerifyOutgoing
base.VerifyServerHostname = a.config.VerifyServerHostname
base.CAFile = a.config.CAFile base.CAFile = a.config.CAFile
base.CertFile = a.config.CertFile base.CertFile = a.config.CertFile
base.KeyFile = a.config.KeyFile base.KeyFile = a.config.KeyFile
base.ServerName = a.config.ServerName base.ServerName = a.config.ServerName
base.Domain = a.config.Domain
// Setup the ServerUp callback // Setup the ServerUp callback
base.ServerUp = a.state.ConsulServerUp base.ServerUp = a.state.ConsulServerUp