static_config.go (traefik-v2.3.2.src) | : | static_config.go (traefik-v2.3.3.src) | ||
---|---|---|---|---|
skipping to change at line 75 | skipping to change at line 75 | |||
Ping *ping.Handler `description:"Enable ping." json:"ping,omitempty" toml:"ping,omitempty" yaml:"ping,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | Ping *ping.Handler `description:"Enable ping." json:"ping,omitempty" toml:"ping,omitempty" yaml:"ping,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | |||
Log *types.TraefikLog `description:"Traefik log settings." json:"lo g,omitempty" toml:"log,omitempty" yaml:"log,omitempty" label:"allowEmpty" file:" allowEmpty" export:"true"` | Log *types.TraefikLog `description:"Traefik log settings." json:"lo g,omitempty" toml:"log,omitempty" yaml:"log,omitempty" label:"allowEmpty" file:" allowEmpty" export:"true"` | |||
AccessLog *types.AccessLog `description:"Access log settings." json:"acc essLog,omitempty" toml:"accessLog,omitempty" yaml:"accessLog,omitempty" label:"a llowEmpty" file:"allowEmpty" export:"true"` | AccessLog *types.AccessLog `description:"Access log settings." json:"acc essLog,omitempty" toml:"accessLog,omitempty" yaml:"accessLog,omitempty" label:"a llowEmpty" file:"allowEmpty" export:"true"` | |||
Tracing *Tracing `description:"OpenTracing configuration." jso n:"tracing,omitempty" toml:"tracing,omitempty" yaml:"tracing,omitempty" label:"a llowEmpty" file:"allowEmpty" export:"true"` | Tracing *Tracing `description:"OpenTracing configuration." jso n:"tracing,omitempty" toml:"tracing,omitempty" yaml:"tracing,omitempty" label:"a llowEmpty" file:"allowEmpty" export:"true"` | |||
HostResolver *types.HostResolverConfig `description:"Enable CNAME Flatten ing." json:"hostResolver,omitempty" toml:"hostResolver,omitempty" yaml:"hostReso lver,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | HostResolver *types.HostResolverConfig `description:"Enable CNAME Flatten ing." json:"hostResolver,omitempty" toml:"hostResolver,omitempty" yaml:"hostReso lver,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | |||
CertificatesResolvers map[string]CertificateResolver `description:"Certif icates resolvers configuration." json:"certificatesResolvers,omitempty" toml:"ce rtificatesResolvers,omitempty" yaml:"certificatesResolvers,omitempty" export:"tr ue"` | CertificatesResolvers map[string]CertificateResolver `description:"Certif icates resolvers configuration." json:"certificatesResolvers,omitempty" toml:"ce rtificatesResolvers,omitempty" yaml:"certificatesResolvers,omitempty" export:"tr ue"` | |||
Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omit empty" toml:"pilot,omitempty" yaml:"pilot,omitempty"` | Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omit empty" toml:"pilot,omitempty" yaml:"pilot,omitempty" export:"true"` | |||
Experimental *Experimental `description:"experimental features." json:"ex perimental,omitempty" toml:"experimental,omitempty" yaml:"experimental,omitempty "` | Experimental *Experimental `description:"experimental features." json:"ex perimental,omitempty" toml:"experimental,omitempty" yaml:"experimental,omitempty " export:"true"` | |||
} | } | |||
// CertificateResolver contains the configuration for the different types of cer tificates resolver. | // CertificateResolver contains the configuration for the different types of cer tificates resolver. | |||
type CertificateResolver struct { | type CertificateResolver struct { | |||
ACME *acmeprovider.Configuration `description:"Enable ACME (Let's Encrypt ): automatic SSL." json:"acme,omitempty" toml:"acme,omitempty" yaml:"acme,omitem pty" export:"true"` | ACME *acmeprovider.Configuration `description:"Enable ACME (Let's Encrypt ): automatic SSL." json:"acme,omitempty" toml:"acme,omitempty" yaml:"acme,omitem pty" export:"true"` | |||
} | } | |||
// Global holds the global configuration. | // Global holds the global configuration. | |||
type Global struct { | type Global struct { | |||
CheckNewVersion bool `description:"Periodically check if a new version has been released." json:"checkNewVersion,omitempty" toml:"checkNewVersion,omit empty" yaml:"checkNewVersion,omitempty" label:"allowEmpty" file:"allowEmpty" exp ort:"true"` | CheckNewVersion bool `description:"Periodically check if a new version has been released." json:"checkNewVersion,omitempty" toml:"checkNewVersion,omit empty" yaml:"checkNewVersion,omitempty" label:"allowEmpty" file:"allowEmpty" exp ort:"true"` | |||
skipping to change at line 179 | skipping to change at line 179 | |||
type Providers struct { | type Providers struct { | |||
ProvidersThrottleDuration ptypes.Duration `description:"Backends throttle duration: minimum duration between 2 events from providers before applying a ne w configuration. It avoids unnecessary reloads if multiples events are sent in a short amount of time." json:"providersThrottleDuration,omitempty" toml:"provide rsThrottleDuration,omitempty" yaml:"providersThrottleDuration,omitempty" export: "true"` | ProvidersThrottleDuration ptypes.Duration `description:"Backends throttle duration: minimum duration between 2 events from providers before applying a ne w configuration. It avoids unnecessary reloads if multiples events are sent in a short amount of time." json:"providersThrottleDuration,omitempty" toml:"provide rsThrottleDuration,omitempty" yaml:"providersThrottleDuration,omitempty" export: "true"` | |||
Docker *docker.Provider `description:"Enable Docker bac kend with default settings." json:"docker,omitempty" toml:"docker,omitempty" yam l:"docker,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | Docker *docker.Provider `description:"Enable Docker bac kend with default settings." json:"docker,omitempty" toml:"docker,omitempty" yam l:"docker,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | |||
File *file.Provider `description:"Enable File backe nd with default settings." json:"file,omitempty" toml:"file,omitempty" yaml:"fil e,omitempty" export:"true"` | File *file.Provider `description:"Enable File backe nd with default settings." json:"file,omitempty" toml:"file,omitempty" yaml:"fil e,omitempty" export:"true"` | |||
Marathon *marathon.Provider `description:"Enable Marathon b ackend with default settings." json:"marathon,omitempty" toml:"marathon,omitempt y" yaml:"marathon,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | Marathon *marathon.Provider `description:"Enable Marathon b ackend with default settings." json:"marathon,omitempty" toml:"marathon,omitempt y" yaml:"marathon,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | |||
KubernetesIngress *ingress.Provider `description:"Enable Kubernetes backend with default settings." json:"kubernetesIngress,omitempty" toml:"kubern etesIngress,omitempty" yaml:"kubernetesIngress,omitempty" export:"true" label:"a llowEmpty" file:"allowEmpty"` | KubernetesIngress *ingress.Provider `description:"Enable Kubernetes backend with default settings." json:"kubernetesIngress,omitempty" toml:"kubern etesIngress,omitempty" yaml:"kubernetesIngress,omitempty" export:"true" label:"a llowEmpty" file:"allowEmpty"` | |||
KubernetesCRD *crd.Provider `description:"Enable Kubernetes backend with default settings." json:"kubernetesCRD,omitempty" toml:"kubernetes CRD,omitempty" yaml:"kubernetesCRD,omitempty" export:"true" label:"allowEmpty" f ile:"allowEmpty"` | KubernetesCRD *crd.Provider `description:"Enable Kubernetes backend with default settings." json:"kubernetesCRD,omitempty" toml:"kubernetes CRD,omitempty" yaml:"kubernetesCRD,omitempty" export:"true" label:"allowEmpty" f ile:"allowEmpty"` | |||
Rest *rest.Provider `description:"Enable Rest backe nd with default settings." json:"rest,omitempty" toml:"rest,omitempty" yaml:"res t,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | Rest *rest.Provider `description:"Enable Rest backe nd with default settings." json:"rest,omitempty" toml:"rest,omitempty" yaml:"res t,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | |||
Rancher *rancher.Provider `description:"Enable Rancher ba ckend with default settings." json:"rancher,omitempty" toml:"rancher,omitempty" yaml:"rancher,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | Rancher *rancher.Provider `description:"Enable Rancher ba ckend with default settings." json:"rancher,omitempty" toml:"rancher,omitempty" yaml:"rancher,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | |||
ConsulCatalog *consulcatalog.Provider `description:"Enable ConsulCata | ConsulCatalog *consulcatalog.Provider `description:"Enable ConsulCata | |||
log backend with default settings." json:"consulCatalog,omitempty" toml:"consulC | log backend with default settings." json:"consulCatalog,omitempty" toml:"consulC | |||
atalog,omitempty" yaml:"consulCatalog,omitempty"` | atalog,omitempty" yaml:"consulCatalog,omitempty" label:"allowEmpty" file:"allowE | |||
Ecs *ecs.Provider `description:"Enable AWS ECS ba | mpty" export:"true"` | |||
ckend with default settings." json:"ecs,omitempty" toml:"ecs,omitempty" yaml:"ec | Ecs *ecs.Provider `description:"Enable AWS ECS ba | |||
s,omitempty"` | ckend with default settings." json:"ecs,omitempty" toml:"ecs,omitempty" yaml:"ec | |||
s,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | ||||
Consul *consul.Provider `description:"Enable Consul backend with defau | Consul *consul.Provider `description:"Enable Consul backend with defau | |||
lt settings." json:"consul,omitempty" toml:"consul,omitempty" yaml:"consul,omite | lt settings." json:"consul,omitempty" toml:"consul,omitempty" yaml:"consul,omite | |||
mpty" export:"true" label:"allowEmpty" file:"allowEmpty"` | mpty" label:"allowEmpty" file:"allowEmpty" export:"true"` | |||
Etcd *etcd.Provider `description:"Enable Etcd backend with default | Etcd *etcd.Provider `description:"Enable Etcd backend with default | |||
settings." json:"etcd,omitempty" toml:"etcd,omitempty" yaml:"etcd,omitempty" ex | settings." json:"etcd,omitempty" toml:"etcd,omitempty" yaml:"etcd,omitempty" la | |||
port:"true" label:"allowEmpty" file:"allowEmpty"` | bel:"allowEmpty" file:"allowEmpty" export:"true"` | |||
ZooKeeper *zk.Provider `description:"Enable ZooKeeper backend with de | ZooKeeper *zk.Provider `description:"Enable ZooKeeper backend with de | |||
fault settings." json:"zooKeeper,omitempty" toml:"zooKeeper,omitempty" yaml:"zoo | fault settings." json:"zooKeeper,omitempty" toml:"zooKeeper,omitempty" yaml:"zoo | |||
Keeper,omitempty" export:"true" label:"allowEmpty" file:"allowEmpty"` | Keeper,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` | |||
Redis *redis.Provider `description:"Enable Redis backend with defaul | Redis *redis.Provider `description:"Enable Redis backend with defaul | |||
t settings." json:"redis,omitempty" toml:"redis,omitempty" yaml:"redis,omitempty | t settings." json:"redis,omitempty" toml:"redis,omitempty" yaml:"redis,omitempty | |||
" export:"true" label:"allowEmpty" file:"allowEmpty"` | " label:"allowEmpty" file:"allowEmpty" export:"true"` | |||
HTTP *http.Provider `description:"Enable HTTP backend with default | HTTP *http.Provider `description:"Enable HTTP backend with default | |||
settings." json:"http,omitempty" toml:"http,omitempty" yaml:"http,omitempty" ex | settings." json:"http,omitempty" toml:"http,omitempty" yaml:"http,omitempty" la | |||
port:"true" label:"allowEmpty" file:"allowEmpty"` | bel:"allowEmpty" file:"allowEmpty" export:"true"` | |||
} | } | |||
// SetEffectiveConfiguration adds missing configuration parameters derived from existing ones. | // SetEffectiveConfiguration adds missing configuration parameters derived from existing ones. | |||
// It also takes care of maintaining backwards compatibility. | // It also takes care of maintaining backwards compatibility. | |||
func (c *Configuration) SetEffectiveConfiguration() { | func (c *Configuration) SetEffectiveConfiguration() { | |||
// Creates the default entry point if needed | // Creates the default entry point if needed | |||
if len(c.EntryPoints) == 0 { | if len(c.EntryPoints) == 0 { | |||
ep := &EntryPoint{Address: ":80"} | ep := &EntryPoint{Address: ":80"} | |||
ep.SetDefaults() | ep.SetDefaults() | |||
c.EntryPoints = EntryPoints{"http": ep} | c.EntryPoints = EntryPoints{"http": ep} | |||
End of changes. 4 change blocks. | ||||
23 lines changed or deleted | 24 lines changed or added |