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
parent b9f826554c
commit 8389b46b5c
74 changed files with 248 additions and 248 deletions
--- 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]
--- 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]
--- 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]
--- 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`)"
--- 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`)
--- 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
--- 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
    ```
--- 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]
--- 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]
--- 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`)
--- 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]
--- a/traefik.sample.toml
+++ b/traefik.sample.toml
@ -20,8 +20,8 @@
 #
 # Optional
 # Default:
-[entrypoints]
-    [entrypoints.web]
+[entryPoints]
+    [entryPoints.web]
    address = ":80"

 ################################################################