luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #2645 from hashicorp/b-fix-consul-verify-ssl

Browse source 
Fix consul.verify_ssl
This commit is contained in:
Michael Schurter 2017-05-15 15:57:13 -07:00 committed by GitHub
parent 5fd438661d a4e2463477
commit b8fdeaca94
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nomad/structs/config/consul.go
View file

@ -1,8 +1,6 @@
package config
import (
"fmt"
"net/http"
"strings"
"time"
@ -84,7 +82,7 @@ func DefaultConsulConfig() *ConsulConfig {
AutoAdvertise: helper.BoolToPtr(true),
ChecksUseAdvertise: helper.BoolToPtr(false),
EnableSSL: helper.BoolToPtr(false),
VerifySSL: helper.BoolToPtr(false),
VerifySSL: helper.BoolToPtr(true),
ServerAutoJoin: helper.BoolToPtr(true),
ClientAutoJoin: helper.BoolToPtr(true),
Timeout: 5 * time.Second,
@ -173,22 +171,14 @@ func (c *ConsulConfig) ApiConfig() (*consul.Config, error) {
}
if c.EnableSSL != nil && *c.EnableSSL {
config.Scheme = "https"
tlsConfig := consul.TLSConfig{
config.TLSConfig = consul.TLSConfig{
Address: config.Address,
CAFile: c.CAFile,
CertFile: c.CertFile,
KeyFile: c.KeyFile,
}
if c.VerifySSL != nil {
tlsConfig.InsecureSkipVerify = !*c.VerifySSL
}
tlsClientCfg, err := consul.SetupTLSConfig(&tlsConfig)
if err != nil {
return nil, fmt.Errorf("error creating tls client config for consul: %v", err)
}
config.HttpClient.Transport = &http.Transport{
TLSClientConfig: tlsClientCfg,
config.TLSConfig.InsecureSkipVerify = !*c.VerifySSL
}
}