diff --git a/docs/content/contributing/data-collection.md b/docs/content/contributing/data-collection.md index 7868399b7..8a6faa405 100644 --- a/docs/content/contributing/data-collection.md +++ b/docs/content/contributing/data-collection.md @@ -50,8 +50,8 @@ Once a day (the first call begins 10 minutes after the start of Traefik), we col ??? example "Original configuration" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" [api] @@ -80,8 +80,8 @@ Once a day (the first call begins 10 minutes after the start of Traefik), we col ??? example "Resulting Obfuscated Configuration" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" [api] diff --git a/docs/content/https-tls/acme.md b/docs/content/https-tls/acme.md index 80dc96c4c..aa3640a17 100644 --- a/docs/content/https-tls/acme.md +++ b/docs/content/https-tls/acme.md @@ -13,11 +13,11 @@ You can configure Traefik to use an ACME provider (like Let's Encrypt) for autom ??? example "Enabling ACME" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.http-tls] + [entryPoints.http-tls] address = ":443" [acme] # every router with TLS enabled will now be able to use ACME for its certificates @@ -31,11 +31,11 @@ You can configure Traefik to use an ACME provider (like Let's Encrypt) for autom ??? example "Configuring Wildcard Certificates" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.http-tls] + [entryPoints.http-tls] address = ":443" [acme] diff --git a/docs/content/operations/ping.md b/docs/content/operations/ping.md index 5313382a6..0cde3ec6e 100644 --- a/docs/content/operations/ping.md +++ b/docs/content/operations/ping.md @@ -14,11 +14,11 @@ Checking the Health of Your Traefik Instances ??? example "Enabling /ping on a dedicated EntryPoint" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.ping] + [entryPoints.ping] address = ":8082" [ping] diff --git a/docs/content/providers/file.md b/docs/content/providers/file.md index e098f77fc..31a55d83d 100644 --- a/docs/content/providers/file.md +++ b/docs/content/providers/file.md @@ -28,7 +28,7 @@ You can write these configuration elements: # Add the router [http.routers] [http.routers.router0] - entrypoints = ["web"] + entryPoints = ["web"] middlewares = ["my-basic-auth"] service = "service-foo" rule = "Path(`foo`)" diff --git a/docs/content/providers/kubernetes-crd.md b/docs/content/providers/kubernetes-crd.md index f3c629872..881f68f93 100644 --- a/docs/content/providers/kubernetes-crd.md +++ b/docs/content/providers/kubernetes-crd.md @@ -28,7 +28,7 @@ metadata: name: ingressroutefoo.crd spec: - entrypoints: + entryPoints: - web routes: # Match is the rule corresponding to an underlying router. @@ -63,7 +63,7 @@ metadata: name: stripprefix spec: - stripprefix: + stripPrefix: prefixes: - /stripit @@ -74,7 +74,7 @@ metadata: name: ingressroutebar.crd spec: - entrypoints: + entryPoints: - web routes: - match: Host(`bar.com`) && PathPrefix(`/stripit`) diff --git a/docs/content/reference/dynamic-configuration/kubernetes-crd.yml b/docs/content/reference/dynamic-configuration/kubernetes-crd.yml index 04bfdd2af..cac510685 100644 --- a/docs/content/reference/dynamic-configuration/kubernetes-crd.yml +++ b/docs/content/reference/dynamic-configuration/kubernetes-crd.yml @@ -32,7 +32,7 @@ kind: IngressRoute metadata: name: ingressroute.crd spec: - entrypoints: + entryPoints: - web - web-secure routes: @@ -45,21 +45,21 @@ spec: services: - name: s1 port: 80 - healthcheck: + healthCheck: path: /health host: baz.com - intervalseconds: 7 - timeoutseconds: 60 + intervalSeconds: 7 + timeoutSeconds: 60 # strategy defines the load balancing strategy between the servers. It defaults # to Round Robin, and for now only Round Robin is supported anyway. strategy: RoundRobin - name: s2 port: 433 - healthcheck: + healthCheck: path: /health host: baz.com - intervalseconds: 7 - timeoutseconds: 60 + intervalSeconds: 7 + timeoutSeconds: 60 - match: PathPrefix(`/misc`) services: - name: s3 diff --git a/docs/content/routing/entrypoints.md b/docs/content/routing/entrypoints.md index 3de56a723..8a72b7876 100644 --- a/docs/content/routing/entrypoints.md +++ b/docs/content/routing/entrypoints.md @@ -13,8 +13,8 @@ They define the port which will receive the requests (whether HTTP or TCP). ??? example "Port 80 only" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" ``` @@ -23,11 +23,11 @@ They define the port which will receive the requests (whether HTTP or TCP). ??? example "Port 80 & 443" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.web-secure] + [entryPoints.web-secure] address = ":443" ``` @@ -118,11 +118,11 @@ Traefik supports [ProxyProtocol](https://www.haproxy.org/download/1.8/doc/proxy- ??? example "Enabling Proxy Protocol with Trusted IPs" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.web.proxyProtocol] + [entryPoints.web.proxyProtocol] trustedIPs = ["127.0.0.1/32", "192.168.1.7"] ``` @@ -133,11 +133,11 @@ Traefik supports [ProxyProtocol](https://www.haproxy.org/download/1.8/doc/proxy- In a test environments, you can configure Traefik to trust every incoming connection. Doing so, every remote client address will be replaced (`trustedIPs` won't have any effect) ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.web.proxyProtocol] + [entryPoints.web.proxyProtocol] insecure = true ``` @@ -153,21 +153,21 @@ You can configure Traefik to trust the forwarded headers information (`X-Forward ??? example "Trusting Forwarded Headers from specific IPs" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.web.forwardedHeaders] + [entryPoints.web.forwardedHeaders] trustedIPs = ["127.0.0.1/32", "192.168.1.7"] ``` ??? example "Insecure Mode -- Always Trusting Forwarded Headers" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":80" - [entrypoints.web.forwardedHeaders] + [entryPoints.web.forwardedHeaders] insecure = true ``` diff --git a/docs/content/routing/overview.md b/docs/content/routing/overview.md index f7394d4ba..8c165c239 100644 --- a/docs/content/routing/overview.md +++ b/docs/content/routing/overview.md @@ -25,8 +25,8 @@ Below is an example of a full configuration file for the [file provider](../prov In the process, Traefik will make sure that the user is authenticated (using the [BasicAuth middleware](../middlewares/basicauth.md)). ```toml -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8081" # Listen on port 8081 for incoming requests [providers] @@ -62,8 +62,8 @@ In the process, Traefik will make sure that the user is authenticated (using the ??? example "Adding a TCP route for TLS requests on whoami.traefik.io" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] address = ":8081" # Listen on port 8081 for incoming requests [providers] diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index 9cdd60c0f..0f6d5f1ac 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -32,16 +32,16 @@ In the process, routers may use pieces of [middleware](../../middlewares/overvie ??? example "Forwarding all (non-tls) requests on port 3306 to a database service" ```toml - [entrypoints] - [entrypoints.mysql-default] + [entryPoints] + [entryPoints.mysql-default] address = ":80" - [entrypoints.mysql-default] + [entryPoints.mysql-default] address = ":3306" [tcp] [tcp.routers] [tcp.routers.to-database] - entrypoints = ["mysql-default"] + entryPoints = ["mysql-default"] rule = "HostSNI(`*`)" # Catch every request (only available rule for non-tls routers. See below.) service = "database" ``` @@ -56,12 +56,12 @@ If you want to limit the router scope to a set of entrypoint, set the entrypoint ??? example "Listens to Every EntryPoint" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] # ... - [entrypoints.web-secure] + [entryPoints.web-secure] # ... - [entrypoints.other] + [entryPoints.other] # ... [http.routers] @@ -74,12 +74,12 @@ If you want to limit the router scope to a set of entrypoint, set the entrypoint ??? example "Listens to Specific EntryPoints" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] # ... - [entrypoint.web-secure] + [entryPoints.web-secure] # ... - [entrypoint.other] + [entryPoints.other] # ... [http.routers] @@ -211,12 +211,12 @@ If you want to limit the router scope to a set of entrypoints, set the entrypoin ??? example "Listens to Every EntryPoint" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] # ... - [entrypoints.web-secure] + [entryPoints.web-secure] # ... - [entrypoints.other] + [entryPoints.other] # ... [tcp.routers] @@ -230,12 +230,12 @@ If you want to limit the router scope to a set of entrypoints, set the entrypoin ??? example "Listens to Specific EntryPoints" ```toml - [entrypoints] - [entrypoints.web] + [entryPoints] + [entryPoints.web] # ... - [entrypoint.web-secure] + [entryPoints.web-secure] # ... - [entrypoint.other] + [entryPoints.other] # ... [tcp.routers] diff --git a/docs/content/user-guides/crd-acme/04-ingressroutes.yml b/docs/content/user-guides/crd-acme/04-ingressroutes.yml index 9e67cc83d..a2d6ab0ce 100644 --- a/docs/content/user-guides/crd-acme/04-ingressroutes.yml +++ b/docs/content/user-guides/crd-acme/04-ingressroutes.yml @@ -3,7 +3,7 @@ kind: IngressRoute metadata: name: simpleingressroute spec: - entrypoints: + entryPoints: - web routes: - match: Host(`your.domain.com`) && PathPrefix(`/notls`) @@ -18,7 +18,7 @@ kind: IngressRoute metadata: name: ingressroutetls spec: - entrypoints: + entryPoints: - websecure routes: - match: Host(`your.domain.com`) && PathPrefix(`/tls`) diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml index cd785dc9f..69e22c66a 100644 --- a/integration/fixtures/access_log_config.toml +++ b/integration/fixtures/access_log_config.toml @@ -9,16 +9,16 @@ filePath = "traefik.log" [accessLog] filePath = "access.log" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.frontendRedirect] + [entryPoints.frontendRedirect] address = ":8005" - [entrypoints.httpFrontendAuth] + [entryPoints.httpFrontendAuth] address = ":8006" - [entrypoints.httpRateLimit] + [entryPoints.httpRateLimit] address = ":8007" - [entrypoints.digestAuth] + [entryPoints.digestAuth] address = ":8008" [api] diff --git a/integration/fixtures/acme/acme_base.toml b/integration/fixtures/acme/acme_base.toml index 943d5e4ad..9123eb0c7 100644 --- a/integration/fixtures/acme/acme_base.toml +++ b/integration/fixtures/acme/acme_base.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = "{{ .PortHTTP }}" - [entrypoints.web-secure] + [entryPoints.web-secure] address = "{{ .PortHTTPS }}" [acme] diff --git a/integration/fixtures/acme/acme_tls.toml b/integration/fixtures/acme/acme_tls.toml index 41bd2941a..a0d3c850f 100644 --- a/integration/fixtures/acme/acme_tls.toml +++ b/integration/fixtures/acme/acme_tls.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = "{{ .PortHTTP }}" - [entrypoints.web-secure] + [entryPoints.web-secure] address = "{{ .PortHTTPS }}" [acme] diff --git a/integration/fixtures/acme/acme_tls_dynamic.toml b/integration/fixtures/acme/acme_tls_dynamic.toml index 614edb036..30f5d09b3 100644 --- a/integration/fixtures/acme/acme_tls_dynamic.toml +++ b/integration/fixtures/acme/acme_tls_dynamic.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = "{{ .PortHTTP }}" - [entrypoints.web-secure] + [entryPoints.web-secure] address = "{{ .PortHTTPS }}" [acme] diff --git a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml index 5c015389f..c08e13b39 100644 --- a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml +++ b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml @@ -5,18 +5,18 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = "{{ .PortHTTP }}" - [entrypoints.web-secure] + [entryPoints.web-secure] address = "{{ .PortHTTPS }}" - [entrypoints.traefik] + [entryPoints.traefik] address = ":9000" # FIXME -# [entrypoints.traefik.tls] -# [entrypoints.traefik.tls.DefaultCertificate] +# [entryPoints.traefik.tls] +# [entryPoints.traefik.tls.DefaultCertificate] # certFile = "fixtures/acme/ssl/wildcard.crt" # keyFile = "fixtures/acme/ssl/wildcard.key" diff --git a/integration/fixtures/docker/minimal.toml b/integration/fixtures/docker/minimal.toml index 99bddf9ae..d4073bcca 100644 --- a/integration/fixtures/docker/minimal.toml +++ b/integration/fixtures/docker/minimal.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/docker/simple.toml b/integration/fixtures/docker/simple.toml index 1974e3833..0ad2f3c30 100644 --- a/integration/fixtures/docker/simple.toml +++ b/integration/fixtures/docker/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/error_pages/error.toml b/integration/fixtures/error_pages/error.toml index 574437ead..6cc387aa2 100644 --- a/integration/fixtures/error_pages/error.toml +++ b/integration/fixtures/error_pages/error.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8080" [providers] diff --git a/integration/fixtures/error_pages/simple.toml b/integration/fixtures/error_pages/simple.toml index d2e710ac9..6ed4a8a4f 100644 --- a/integration/fixtures/error_pages/simple.toml +++ b/integration/fixtures/error_pages/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8080" [providers] diff --git a/integration/fixtures/file/56-simple-panic.toml b/integration/fixtures/file/56-simple-panic.toml index 5a763f6f4..328208efa 100644 --- a/integration/fixtures/file/56-simple-panic.toml +++ b/integration/fixtures/file/56-simple-panic.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" diff --git a/integration/fixtures/file/directory.toml b/integration/fixtures/file/directory.toml index 8a2fb10e4..c9260ee47 100644 --- a/integration/fixtures/file/directory.toml +++ b/integration/fixtures/file/directory.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [providers] diff --git a/integration/fixtures/file/simple.toml b/integration/fixtures/file/simple.toml index 5b082b2d6..8229d03d6 100644 --- a/integration/fixtures/file/simple.toml +++ b/integration/fixtures/file/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [providers] diff --git a/integration/fixtures/grpc/config.toml b/integration/fixtures/grpc/config.toml index 849c51867..ca25ee2ad 100644 --- a/integration/fixtures/grpc/config.toml +++ b/integration/fixtures/grpc/config.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/grpc/config_h2c.toml b/integration/fixtures/grpc/config_h2c.toml index d5b533cdc..cd5259e7d 100644 --- a/integration/fixtures/grpc/config_h2c.toml +++ b/integration/fixtures/grpc/config_h2c.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8081" [api] diff --git a/integration/fixtures/grpc/config_h2c_termination.toml b/integration/fixtures/grpc/config_h2c_termination.toml index 8e74581b8..d8ccc5233 100644 --- a/integration/fixtures/grpc/config_h2c_termination.toml +++ b/integration/fixtures/grpc/config_h2c_termination.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" diff --git a/integration/fixtures/grpc/config_insecure.toml b/integration/fixtures/grpc/config_insecure.toml index 040ebbb0f..80e6ea1d5 100644 --- a/integration/fixtures/grpc/config_insecure.toml +++ b/integration/fixtures/grpc/config_insecure.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] insecureSkipVerify = true -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/grpc/config_retry.toml b/integration/fixtures/grpc/config_retry.toml index 279b5bcb7..756fb4e1a 100644 --- a/integration/fixtures/grpc/config_retry.toml +++ b/integration/fixtures/grpc/config_retry.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/grpc/config_with_flush.toml b/integration/fixtures/grpc/config_with_flush.toml index 849c51867..ca25ee2ad 100644 --- a/integration/fixtures/grpc/config_with_flush.toml +++ b/integration/fixtures/grpc/config_with_flush.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] rootCAs = [ """{{ .CertContent }}""" ] -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/headers/basic.toml b/integration/fixtures/headers/basic.toml index f2dc8d022..341df9667 100644 --- a/integration/fixtures/headers/basic.toml +++ b/integration/fixtures/headers/basic.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [providers] diff --git a/integration/fixtures/headers/cors.toml b/integration/fixtures/headers/cors.toml index 39d696927..7b554d37c 100644 --- a/integration/fixtures/headers/cors.toml +++ b/integration/fixtures/headers/cors.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [providers] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml index 641be97ca..b0a45b2b9 100644 --- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml +++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.http1] +[entryPoints] + [entryPoints.http1] address = ":8000" - [entrypoints.http2] + [entryPoints.http2] address = ":9000" [api] diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml index 658b5bafb..6658aa5fa 100644 --- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml +++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.http1] +[entryPoints] + [entryPoints.http1] address = ":8000" - [entrypoints.http2] + [entryPoints.http2] address = ":9000" [api] diff --git a/integration/fixtures/healthcheck/port_overload.toml b/integration/fixtures/healthcheck/port_overload.toml index 7587fb017..ca29f0e91 100644 --- a/integration/fixtures/healthcheck/port_overload.toml +++ b/integration/fixtures/healthcheck/port_overload.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/healthcheck/simple.toml b/integration/fixtures/healthcheck/simple.toml index 7a848c775..6f82648dd 100644 --- a/integration/fixtures/healthcheck/simple.toml +++ b/integration/fixtures/healthcheck/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/https/clientca/https_1ca1config.toml b/integration/fixtures/https/clientca/https_1ca1config.toml index 645bf373a..ac96518f1 100644 --- a/integration/fixtures/https/clientca/https_1ca1config.toml +++ b/integration/fixtures/https/clientca/https_1ca1config.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/clientca/https_2ca1config.toml b/integration/fixtures/https/clientca/https_2ca1config.toml index c4964f028..2b2191a87 100644 --- a/integration/fixtures/https/clientca/https_2ca1config.toml +++ b/integration/fixtures/https/clientca/https_2ca1config.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/clientca/https_2ca2config.toml b/integration/fixtures/https/clientca/https_2ca2config.toml index 0a7fb6263..68c7f0552 100644 --- a/integration/fixtures/https/clientca/https_2ca2config.toml +++ b/integration/fixtures/https/clientca/https_2ca2config.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/dynamic_https_sni.toml b/integration/fixtures/https/dynamic_https_sni.toml index 7734b40e7..f8a67f45d 100644 --- a/integration/fixtures/https/dynamic_https_sni.toml +++ b/integration/fixtures/https/dynamic_https_sni.toml @@ -5,11 +5,11 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" - [entrypoints.https02] + [entryPoints.https02] address = ":8443" [api] diff --git a/integration/fixtures/https/dynamic_https_sni_default_cert.toml b/integration/fixtures/https/dynamic_https_sni_default_cert.toml index 5701ae4e2..9f21dbb47 100644 --- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml +++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/https_redirect.toml b/integration/fixtures/https/https_redirect.toml index 7897c0daf..5ac100f56 100644 --- a/integration/fixtures/https/https_redirect.toml +++ b/integration/fixtures/https/https_redirect.toml @@ -5,11 +5,11 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8888" - [entrypoints.web-secure] + [entryPoints.web-secure] address = ":8443" [api] @@ -19,121 +19,121 @@ logLevel = "DEBUG" [http.routers] [http.routers.router1] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`example.com`)" middlewares = ["redirect-https"] service = "service1" [http.routers.router1TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`example.com`)" service = "service1" [http.routers.router1TLS.tls] [http.routers.router2] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`example2.com`)" middlewares = ["redirect-https", "api-slash-strip"] service = "service1" [http.routers.router2TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`example2.com`)" service = "service1" [http.routers.router2TLS.tls] [http.routers.router3] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`test.com`)" middlewares = ["redirect-https", "foo-add-prefix"] service = "service1" [http.routers.router3TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`test.com`)" service = "service1" [http.routers.router3TLS.tls] [http.routers.router4] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`test2.com`)" middlewares = ["redirect-https", "foo-slash-add-prefix"] service = "service1" [http.routers.router4TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`test2.com`)" service = "service1" [http.routers.router4TLS.tls] [http.routers.router5] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`foo.com`)" middlewares = ["redirect-https", "id-strip-regex-prefix"] service = "service1" [http.routers.router5TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`foo.com`)" service = "service1" [http.routers.router5TLS.tls] [http.routers.router6] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`foo2.com`)" middlewares = ["redirect-https", "id-slash-strip-regex-prefix"] service = "service1" [http.routers.router6TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`foo2.com`)" service = "service1" [http.routers.router6TLS.tls] [http.routers.router7] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`bar.com`)" middlewares = ["redirect-https", "api-regex-replace"] service = "service1" [http.routers.router7TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`bar.com`)" service = "service1" [http.routers.router7TLS.tls] [http.routers.router8] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`bar2.com`)" middlewares = ["redirect-https", "api-slash-regex-replace"] service = "service1" [http.routers.router8TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`bar2.com`)" service = "service1" [http.routers.router8TLS.tls] [http.routers.router9] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`pow.com`)" middlewares = ["redirect-https", "api-replace-path"] service = "service1" [http.routers.router9TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`pow.com`)" service = "service1" [http.routers.router9TLS.tls] [http.routers.router10] - entrypoints = [ "web" ] + entryPoints = [ "web" ] rule = "Host(`pow2.com`)" middlewares = ["redirect-https", "api-slash-replace-path"] service = "service1" [http.routers.router10TLS] - entrypoints = [ "web-secure" ] + entryPoints = [ "web-secure" ] rule = "Host(`pow2.com`)" service = "service1" [http.routers.router10TLS.tls] diff --git a/integration/fixtures/https/https_sni.toml b/integration/fixtures/https/https_sni.toml index 3a225db89..956b884ac 100644 --- a/integration/fixtures/https/https_sni.toml +++ b/integration/fixtures/https/https_sni.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml index 0f26eb6ea..4d7e28ab8 100644 --- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml +++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/https_sni_default_cert.toml b/integration/fixtures/https/https_sni_default_cert.toml index 757346226..056bee7fe 100644 --- a/integration/fixtures/https/https_sni_default_cert.toml +++ b/integration/fixtures/https/https_sni_default_cert.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/https_sni_strict.toml b/integration/fixtures/https/https_sni_strict.toml index 653bd2cc5..df4af0028 100644 --- a/integration/fixtures/https/https_sni_strict.toml +++ b/integration/fixtures/https/https_sni_strict.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":4443" [api] diff --git a/integration/fixtures/https/rootcas/https.toml b/integration/fixtures/https/rootcas/https.toml index 0638a7f3b..37349218c 100644 --- a/integration/fixtures/https/rootcas/https.toml +++ b/integration/fixtures/https/rootcas/https.toml @@ -24,8 +24,8 @@ fblo6RBxUQ== -----END CERTIFICATE----- """] -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8081" [api] diff --git a/integration/fixtures/https/rootcas/https_with_file.toml b/integration/fixtures/https/rootcas/https_with_file.toml index c528c25e7..b28c386e5 100644 --- a/integration/fixtures/https/rootcas/https_with_file.toml +++ b/integration/fixtures/https/rootcas/https_with_file.toml @@ -9,8 +9,8 @@ logLevel = "DEBUG" # Use certificate in net/internal/testcert.go rootCAs = [ "fixtures/https/rootcas/local.crt"] -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8081" [api] diff --git a/integration/fixtures/k8s/03-ingressroute.yml b/integration/fixtures/k8s/03-ingressroute.yml index 303d8bdfa..1342e3f4e 100644 --- a/integration/fixtures/k8s/03-ingressroute.yml +++ b/integration/fixtures/k8s/03-ingressroute.yml @@ -5,7 +5,7 @@ metadata: namespace: default spec: - entrypoints: + entryPoints: - web routes: diff --git a/integration/fixtures/k8s/04-ingressroute.yml b/integration/fixtures/k8s/04-ingressroute.yml index eddcc28aa..276bff98c 100644 --- a/integration/fixtures/k8s/04-ingressroute.yml +++ b/integration/fixtures/k8s/04-ingressroute.yml @@ -5,7 +5,7 @@ metadata: namespace: default spec: - stripprefix: + stripPrefix: prefixes: - /tobestripped @@ -17,7 +17,7 @@ metadata: namespace: default spec: - entrypoints: + entryPoints: - web routes: - match: Host(`foo.com`) && PathPrefix(`/tobestripped`) diff --git a/integration/fixtures/log_rotation_config.toml b/integration/fixtures/log_rotation_config.toml index a819b79f2..12acdac0a 100644 --- a/integration/fixtures/log_rotation_config.toml +++ b/integration/fixtures/log_rotation_config.toml @@ -9,10 +9,10 @@ logLevel = "ERROR" [accessLog] filePath = "access.log" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.api] + [entryPoints.api] address = ":7888" [api] diff --git a/integration/fixtures/marathon/simple.toml b/integration/fixtures/marathon/simple.toml index a052ad2f7..600794d30 100644 --- a/integration/fixtures/marathon/simple.toml +++ b/integration/fixtures/marathon/simple.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" -[entrypoints.api] +[entryPoints.api] address = ":9090" [api] diff --git a/integration/fixtures/multiple_provider.toml b/integration/fixtures/multiple_provider.toml index b5f80b2e2..afebad773 100644 --- a/integration/fixtures/multiple_provider.toml +++ b/integration/fixtures/multiple_provider.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/multiprovider.toml b/integration/fixtures/multiprovider.toml index e7537afb1..6211a9c92 100644 --- a/integration/fixtures/multiprovider.toml +++ b/integration/fixtures/multiprovider.toml @@ -7,8 +7,8 @@ logLevel = "DEBUG" [api] -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [Providers] diff --git a/integration/fixtures/proxy-protocol/with.toml b/integration/fixtures/proxy-protocol/with.toml index c761823fd..9b3e00936 100644 --- a/integration/fixtures/proxy-protocol/with.toml +++ b/integration/fixtures/proxy-protocol/with.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.web.proxyProtocol] + [entryPoints.web.proxyProtocol] trustedIPs = ["{{.HaproxyIP}}"] [api] diff --git a/integration/fixtures/proxy-protocol/without.toml b/integration/fixtures/proxy-protocol/without.toml index 77c15b59c..95cc33669 100644 --- a/integration/fixtures/proxy-protocol/without.toml +++ b/integration/fixtures/proxy-protocol/without.toml @@ -5,10 +5,10 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.web.proxyProtocol] + [entryPoints.web.proxyProtocol] trustedIPs = ["1.2.3.4"] [api] diff --git a/integration/fixtures/ratelimit/simple.toml b/integration/fixtures/ratelimit/simple.toml index d9c979e12..6d9f82f90 100644 --- a/integration/fixtures/ratelimit/simple.toml +++ b/integration/fixtures/ratelimit/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":80" [providers] diff --git a/integration/fixtures/reqacceptgrace.toml b/integration/fixtures/reqacceptgrace.toml index c5b459829..1894018fc 100644 --- a/integration/fixtures/reqacceptgrace.toml +++ b/integration/fixtures/reqacceptgrace.toml @@ -5,15 +5,15 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.web.transport.lifeCycle] + [entryPoints.web.transport.lifeCycle] RequestAcceptGraceTimeout = "10s" - [entrypoints.traefik] + [entryPoints.traefik] address = ":8001" -[entrypoints.traefik.transport.lifeCycle] +[entryPoints.traefik.transport.lifeCycle] RequestAcceptGraceTimeout = "10s" [ping] diff --git a/integration/fixtures/rest/simple.toml b/integration/fixtures/rest/simple.toml index f2896a229..9ab8f2572 100644 --- a/integration/fixtures/rest/simple.toml +++ b/integration/fixtures/rest/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/retry/simple.toml b/integration/fixtures/retry/simple.toml index 03b2cb8b4..180221858 100644 --- a/integration/fixtures/retry/simple.toml +++ b/integration/fixtures/retry/simple.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/simple_auth.toml b/integration/fixtures/simple_auth.toml index 2c4e48c6a..96fb3109b 100644 --- a/integration/fixtures/simple_auth.toml +++ b/integration/fixtures/simple_auth.toml @@ -5,11 +5,11 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.traefik] + [entryPoints.traefik] address = ":8001" [api] diff --git a/integration/fixtures/simple_default.toml b/integration/fixtures/simple_default.toml index 4be589581..a97b07a01 100644 --- a/integration/fixtures/simple_default.toml +++ b/integration/fixtures/simple_default.toml @@ -2,6 +2,6 @@ checkNewVersion = false sendAnonymousUsage = false -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" diff --git a/integration/fixtures/simple_hostresolver.toml b/integration/fixtures/simple_hostresolver.toml index 053a89a6b..1e9c582df 100644 --- a/integration/fixtures/simple_hostresolver.toml +++ b/integration/fixtures/simple_hostresolver.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/simple_stats.toml b/integration/fixtures/simple_stats.toml index 317b45e95..1cc33c3ef 100644 --- a/integration/fixtures/simple_stats.toml +++ b/integration/fixtures/simple_stats.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/simple_web.toml b/integration/fixtures/simple_web.toml index 3eb2cfd4a..59f1d92c8 100644 --- a/integration/fixtures/simple_web.toml +++ b/integration/fixtures/simple_web.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/simple_whitelist.toml b/integration/fixtures/simple_whitelist.toml index b6cbf1463..b328109e9 100644 --- a/integration/fixtures/simple_whitelist.toml +++ b/integration/fixtures/simple_whitelist.toml @@ -5,12 +5,12 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" - [entrypoints.web.ForwardedHeaders] + [entryPoints.web.ForwardedHeaders] insecure=true - [entrypoints.web.ClientIPStrategy] + [entryPoints.web.ClientIPStrategy] depth=2 [api] diff --git a/integration/fixtures/tcp/mixed.toml b/integration/fixtures/tcp/mixed.toml index 6fc65c777..5b0a8352e 100644 --- a/integration/fixtures/tcp/mixed.toml +++ b/integration/fixtures/tcp/mixed.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.tcp] +[entryPoints] + [entryPoints.tcp] address = ":8093" [api] @@ -21,7 +21,7 @@ logLevel = "DEBUG" entrypoint=["tcp"] [http.routers.my-https-router] - entrypoints=["tcp"] + entryPoints=["tcp"] rule = "Path(`/whoami/`)" service = "whoami" [http.routers.my-https-router.tls] @@ -36,21 +36,21 @@ logLevel = "DEBUG" [tcp.routers.to-whoami-a] rule = "HostSNI(`whoami-a.test`)" service = "whoami-a" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-a.tls] passthrough=true [tcp.routers.to-whoami-b] rule = "HostSNI(`whoami-b.test`)" service = "whoami-b" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-b.tls] passthrough=true [tcp.routers.to-whoami-no-cert] rule = "HostSNI(`whoami-c.test`)" service = "whoami-no-cert" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-no-cert.tls] [tcp.services.whoami-a] diff --git a/integration/fixtures/tcp/non-tls-fallback.toml b/integration/fixtures/tcp/non-tls-fallback.toml index 4c1b02e84..ab73ddf30 100644 --- a/integration/fixtures/tcp/non-tls-fallback.toml +++ b/integration/fixtures/tcp/non-tls-fallback.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.tcp] +[entryPoints] + [entryPoints.tcp] address = ":8093" [api] @@ -18,25 +18,25 @@ logLevel = "DEBUG" [tcp.routers.to-whoami-a] rule = "HostSNI(`whoami-a.test`)" service = "whoami-a" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-a.tls] passthrough=true [tcp.routers.to-whoami-b] rule = "HostSNI(`whoami-b.test`)" service = "whoami-b" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-b.tls] passthrough=true [tcp.routers.to-whoami-no-cert] rule = "HostSNI(`whoami-c.test`)" service = "whoami-no-cert" - entrypoints = [ "tcp" ] + entryPoints = [ "tcp" ] [tcp.routers.to-whoami-no-cert.tls] [tcp.routers.to-whoami-no-tls] - entrypoints = ["tcp"] + entryPoints = ["tcp"] rule="HostSNI(`*`)" service = "whoami-no-tls" diff --git a/integration/fixtures/tcp/non-tls.toml b/integration/fixtures/tcp/non-tls.toml index a51dbe764..0c847777f 100644 --- a/integration/fixtures/tcp/non-tls.toml +++ b/integration/fixtures/tcp/non-tls.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.tcp] +[entryPoints] + [entryPoints.tcp] address = ":8093" [api] @@ -16,7 +16,7 @@ logLevel = "DEBUG" [tcp] [tcp.routers] [tcp.routers.to-whoami-no-tls] - entrypoints = ["tcp"] + entryPoints = ["tcp"] rule="HostSNI(`*`)" service = "whoami-no-tls" diff --git a/integration/fixtures/timeout/forwarding_timeouts.toml b/integration/fixtures/timeout/forwarding_timeouts.toml index ff6411dcf..935d4a0f4 100644 --- a/integration/fixtures/timeout/forwarding_timeouts.toml +++ b/integration/fixtures/timeout/forwarding_timeouts.toml @@ -9,8 +9,8 @@ logLevel = "DEBUG" dialTimeout = "300ms" responseHeaderTimeout = "300ms" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [accessLog] diff --git a/integration/fixtures/tlsclientheaders/simple.toml b/integration/fixtures/tlsclientheaders/simple.toml index 9a0051027..4595942d6 100644 --- a/integration/fixtures/tlsclientheaders/simple.toml +++ b/integration/fixtures/tlsclientheaders/simple.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] rootCAs = [ """{{ .RootCertContent }}""" ] -[entrypoints] - [entrypoints.web-secure] +[entryPoints] + [entryPoints.web-secure] address = ":8443" [api] diff --git a/integration/fixtures/tracing/simple.toml b/integration/fixtures/tracing/simple.toml index 1f33124b8..7fa4be0f7 100644 --- a/integration/fixtures/tracing/simple.toml +++ b/integration/fixtures/tracing/simple.toml @@ -7,8 +7,8 @@ logLevel = "DEBUG" [api] -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [tracing] diff --git a/integration/fixtures/traefik_log_config.toml b/integration/fixtures/traefik_log_config.toml index 98f476735..3135807ee 100644 --- a/integration/fixtures/traefik_log_config.toml +++ b/integration/fixtures/traefik_log_config.toml @@ -9,8 +9,8 @@ filePath = "traefik.log" [accessLog] filePath = "access.log" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/websocket/config.toml b/integration/fixtures/websocket/config.toml index 209d2abdf..88659b149 100644 --- a/integration/fixtures/websocket/config.toml +++ b/integration/fixtures/websocket/config.toml @@ -5,8 +5,8 @@ sendAnonymousUsage = false [log] logLevel = "DEBUG" -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":8000" [api] diff --git a/integration/fixtures/websocket/config_https.toml b/integration/fixtures/websocket/config_https.toml index 90fb733da..0da7ba507 100644 --- a/integration/fixtures/websocket/config_https.toml +++ b/integration/fixtures/websocket/config_https.toml @@ -8,8 +8,8 @@ logLevel = "DEBUG" [serversTransport] insecureSkipVerify=true -[entrypoints] - [entrypoints.wss] +[entryPoints] + [entryPoints.wss] address = ":8000" [api] diff --git a/traefik.sample.toml b/traefik.sample.toml index 735e50aac..7b13a3f88 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -20,8 +20,8 @@ # # Optional # Default: -[entrypoints] - [entrypoints.web] +[entryPoints] + [entryPoints.web] address = ":80" ################################################################