diff --git a/configuration.go b/configuration.go index aa91a16f9..e2db028b6 100644 --- a/configuration.go +++ b/configuration.go @@ -216,7 +216,6 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { var defaultDocker provider.Docker defaultDocker.Watch = true defaultDocker.Endpoint = "unix:///var/run/docker.sock" - defaultDocker.TLS = &provider.DockerTLS{} // default File var defaultFile provider.File @@ -238,8 +237,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { var defaultConsul provider.Consul defaultConsul.Watch = true defaultConsul.Endpoint = "127.0.0.1:8500" - defaultConsul.Prefix = "/traefik" - defaultConsul.TLS = &provider.KvTLS{} + defaultConsul.Prefix = "traefik" defaultConsul.Constraints = []types.Constraint{} // default ConsulCatalog @@ -252,7 +250,6 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { defaultEtcd.Watch = true defaultEtcd.Endpoint = "127.0.0.1:400" defaultEtcd.Prefix = "/traefik" - defaultEtcd.TLS = &provider.KvTLS{} defaultEtcd.Constraints = []types.Constraint{} //default Zookeeper diff --git a/provider/kv.go b/provider/kv.go index 42181718a..728e8a2f3 100644 --- a/provider/kv.go +++ b/provider/kv.go @@ -95,7 +95,7 @@ func (provider *Kv) provide(configurationChan chan<- types.ConfigMessage, pool * cert, err := tls.LoadX509KeyPair(provider.TLS.Cert, provider.TLS.Key) if err != nil { - return fmt.Errorf("Failed to load keypair. %s", err) + return fmt.Errorf("Failed to load TLS keypair: %v", err) } storeConfig.TLS = &tls.Config{