Use the same case every where for entryPoints.

2019-04-15 11:14:05 +02:00 · 2019-04-15 11:14:05 +02:00 · 8389b46b5c
commit 8389b46b5c
parent b9f826554c
74 changed files with 248 additions and 248 deletions
--- 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]
--- 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]
--- 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]
--- 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]
--- 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"

--- 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]
--- 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]
--- 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]
--- 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]
--- 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"


--- 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]
--- 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]
--- 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]
--- 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]
--- 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"


--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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:
--- 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`)
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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"
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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"

--- 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"

--- 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]
--- 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]
--- 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]
--- 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]
--- 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]
--- 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]