Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix default KV configuration #450

Merged
merged 1 commit into from
Jun 11, 2016
Merged

Fix default KV configuration #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion provider/kv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down