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

Merge pull request #4371 from hashicorp/bugfix/gh-4358 

Remove https://prefix from TLSConfig.Address
pull/4387/head
Matt Keeler 2018-07-11 08:50:10 -04:00 committed by GitHub
parent 1fe325fb81 962f6a1816
commit 4d1ead10b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/agent.go
View File

@ -742,7 +742,8 @@ func (a *Agent) reloadWatches(cfg *config.RuntimeConfig) error {
if a.config.CAFile != "" { if a.config.CAFile != "" {
config.TLSConfig.CAFile = a.config.CAFile config.TLSConfig.CAFile = a.config.CAFile
} }
config.TLSConfig.Address = addr // use the original address without the https:// prefix
config.TLSConfig.Address = netaddr.String()
} }
if err := wp.RunWithConfig(addr, config); err != nil { if err := wp.RunWithConfig(addr, config); err != nil {