baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Clarify that provider-enabling argument parameters set all defaults.

Browse source
This commit is contained in:
Timo Reimann 2017-07-05 23:14:06 +02:00 committed by Ludovic Fernandez
parent b7daa2f3a4
commit a89eb122a0
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/basics.md
View file

@ -444,12 +444,14 @@ The static configuration is the global configuration which is setting up connect
Træfik can be configured using many configuration sources with the following precedence order. Træfik can be configured using many configuration sources with the following precedence order.
Each item takes precedence over the item below it: Each item takes precedence over the item below it:
- [Key-value Store](/basics/#key-value-stores) - [Key-value store](/basics/#key-value-stores)
- [Arguments](/basics/#arguments) - [Arguments](/basics/#arguments)
- [Configuration file](/basics/#configuration-file) - [Configuration file](/basics/#configuration-file)
- Default - Default
It means that arguments override configuration file, and Key-value Store overrides arguments. It means that arguments override configuration file, and key-value store overrides arguments.
Note that the provider-enabling argument parameters (e.g., `--docker`) set all default values for the specific provider. It must not be used if a configuration source with less precedence wants to set a non-default provider value.
### Configuration file ### Configuration file

30
server/configuration.go
View file

@ -59,21 +59,21 @@ type GlobalConfiguration struct {
RootCAs RootCAs `description:"Add cert file for self-signed certicate"` RootCAs RootCAs `description:"Add cert file for self-signed certicate"`
Retry *Retry `description:"Enable retry sending request if network error"` Retry *Retry `description:"Enable retry sending request if network error"`
HealthCheck *HealthCheckConfig `description:"Health check parameters"` HealthCheck *HealthCheckConfig `description:"Health check parameters"`
Docker *docker.Provider `description:"Enable Docker backend"` Docker *docker.Provider `description:"Enable Docker backend with default settings"`
File *file.Provider `description:"Enable File backend"` File *file.Provider `description:"Enable File backend with default settings"`
Web *WebProvider `description:"Enable Web backend"` Web *WebProvider `description:"Enable Web backend with default settings"`
Marathon *marathon.Provider `description:"Enable Marathon backend"` Marathon *marathon.Provider `description:"Enable Marathon backend with default settings"`
Consul *consul.Provider `description:"Enable Consul backend"` Consul *consul.Provider `description:"Enable Consul backend with default settings"`
ConsulCatalog *consul.CatalogProvider `description:"Enable Consul catalog backend"` ConsulCatalog *consul.CatalogProvider `description:"Enable Consul catalog backend with default settings"`
Etcd *etcd.Provider `description:"Enable Etcd backend"` Etcd *etcd.Provider `description:"Enable Etcd backend with default settings"`
Zookeeper *zk.Provider `description:"Enable Zookeeper backend"` Zookeeper *zk.Provider `description:"Enable Zookeeper backend with default settings"`
Boltdb *boltdb.Provider `description:"Enable Boltdb backend"` Boltdb *boltdb.Provider `description:"Enable Boltdb backend with default settings"`
Kubernetes *kubernetes.Provider `description:"Enable Kubernetes backend"` Kubernetes *kubernetes.Provider `description:"Enable Kubernetes backend with default settings"`
Mesos *mesos.Provider `description:"Enable Mesos backend"` Mesos *mesos.Provider `description:"Enable Mesos backend with default settings"`
Eureka *eureka.Provider `description:"Enable Eureka backend"` Eureka *eureka.Provider `description:"Enable Eureka backend with default settings"`
ECS *ecs.Provider `description:"Enable ECS backend"` ECS *ecs.Provider `description:"Enable ECS backend with default settings"`
Rancher *rancher.Provider `description:"Enable Rancher backend"` Rancher *rancher.Provider `description:"Enable Rancher backend with default settings"`
DynamoDB *dynamodb.Provider `description:"Enable DynamoDB backend"` DynamoDB *dynamodb.Provider `description:"Enable DynamoDB backend with default settings"`
} }
// DefaultEntryPoints holds default entry points // DefaultEntryPoints holds default entry points