diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6f73e85ec..ec0c32edb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ env: jobs: build-webui: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code @@ -35,7 +35,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-22.04, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] needs: - build-webui diff --git a/.github/workflows/check_doc.yml b/.github/workflows/check_doc.yml index 9851e1a54..c5fbddcec 100644 --- a/.github/workflows/check_doc.yml +++ b/.github/workflows/check_doc.yml @@ -9,7 +9,7 @@ jobs: docs: name: Check, verify and build documentation - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index a11b57e50..584dccd5c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -14,7 +14,7 @@ jobs: docs: name: Doc Process - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest if: github.repository == 'traefik/traefik' steps: diff --git a/.github/workflows/experimental.yaml b/.github/workflows/experimental.yaml index bced49ca8..b20d31124 100644 --- a/.github/workflows/experimental.yaml +++ b/.github/workflows/experimental.yaml @@ -15,7 +15,7 @@ jobs: experimental: if: github.repository == 'traefik/traefik' name: Build experimental image on branch - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test-conformance.yaml b/.github/workflows/test-conformance.yaml index 7cc6b19b9..e6147d2c6 100644 --- a/.github/workflows/test-conformance.yaml +++ b/.github/workflows/test-conformance.yaml @@ -15,7 +15,7 @@ env: jobs: test-conformance: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out code diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml index 665da80f3..a8c6a4f64 100644 --- a/.github/workflows/test-integration.yaml +++ b/.github/workflows/test-integration.yaml @@ -12,7 +12,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code @@ -32,7 +32,7 @@ jobs: run: make binary test-integration: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: - build strategy: diff --git a/.github/workflows/test-unit.yaml b/.github/workflows/test-unit.yaml index c23db68c3..36721ba85 100644 --- a/.github/workflows/test-unit.yaml +++ b/.github/workflows/test-unit.yaml @@ -11,7 +11,7 @@ env: jobs: test-unit: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 1ba3a6d61..4ed4a3542 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -13,7 +13,7 @@ env: jobs: validate: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code @@ -39,7 +39,7 @@ jobs: run: make validate validate-generate: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check out code diff --git a/docs/content/getting-started/faq.md b/docs/content/getting-started/faq.md index 761e8d3a7..facdd71bf 100644 --- a/docs/content/getting-started/faq.md +++ b/docs/content/getting-started/faq.md @@ -93,7 +93,7 @@ The example below is a file provider only version (`yaml`) of what this configur ```yaml tab="Static configuration" # traefik.yml -entrypoints: +entryPoints: web: address: :80 diff --git a/docs/content/https/acme.md b/docs/content/https/acme.md index 99e64c76d..b012263ac 100644 --- a/docs/content/https/acme.md +++ b/docs/content/https/acme.md @@ -116,8 +116,8 @@ Please check the [configuration examples below](#configuration-examples) for mor ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 # ... --certificatesresolvers.myresolver.acme.email=your-email@example.com --certificatesresolvers.myresolver.acme.storage=acme.json @@ -241,8 +241,8 @@ when using the `HTTP-01` challenge, `certificatesresolvers.myresolver.acme.httpc ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 # ... --certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web ``` diff --git a/docs/content/migration/v1-to-v2.md b/docs/content/migration/v1-to-v2.md index cb2c9b539..709c53be5 100644 --- a/docs/content/migration/v1-to-v2.md +++ b/docs/content/migration/v1-to-v2.md @@ -354,7 +354,7 @@ To apply a redirection: ``` ```bash tab="CLI" - --entrypoints=Name:web Address::80 Redirect.EntryPoint:websecure + --entryPoints=Name:web Address::80 Redirect.EntryPoint:websecure --entryPoints='Name:websecure Address::443 TLS' ``` @@ -394,10 +394,10 @@ To apply a redirection: ```bash tab="CLI" ## static configuration - --entrypoints.web.address=:80 - --entrypoints.web.http.redirections.entrypoint.to=websecure - --entrypoints.web.http.redirections.entrypoint.scheme=https - --entrypoints.websecure.address=:443 + --entryPoints.web.address=:80 + --entryPoints.web.http.redirections.entrypoint.to=websecure + --entryPoints.web.http.redirections.entrypoint.scheme=https + --entryPoints.websecure.address=:443 --providers.docker=true ``` @@ -750,8 +750,8 @@ with the path `/admin` stripped, e.g. to `http://:/`. In this case, yo ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 --certificatesresolvers.myresolver.acme.email=your-email@example.com --certificatesresolvers.myresolver.acme.storage=acme.json --certificatesresolvers.myresolver.acme.tlschallenge=true @@ -1078,7 +1078,7 @@ To activate the dashboard, you can either: routers: api: rule: Host(`traefik.docker.localhost`) - entrypoints: + entryPoints: - websecure service: api@internal middlewares: diff --git a/docs/content/migration/v2.md b/docs/content/migration/v2.md index 5ee93cc9c..a4669f7a5 100644 --- a/docs/content/migration/v2.md +++ b/docs/content/migration/v2.md @@ -622,7 +622,7 @@ Starting with `v2.11.2` the `.transport.respondingTimeouts.tcp.linge ### RespondingTimeouts.TCP and RespondingTimeouts.HTTP Starting with `v2.11.2` the `respondingTimeouts.tcp` and `respondingTimeouts.http` sections introduced in `v2.11.1` have been removed. -To configure responding timeouts +To configure the responding timeouts, please use the [`respondingTimeouts`](../routing/entrypoints.md#respondingtimeouts) section. ### EntryPoint.Transport.RespondingTimeouts.ReadTimeout diff --git a/docs/content/reference/dynamic-configuration/kubernetes-gateway-traefik-lb-svc.yml b/docs/content/reference/dynamic-configuration/kubernetes-gateway-traefik-lb-svc.yml index c9f30f444..c9b3d4fca 100644 --- a/docs/content/reference/dynamic-configuration/kubernetes-gateway-traefik-lb-svc.yml +++ b/docs/content/reference/dynamic-configuration/kubernetes-gateway-traefik-lb-svc.yml @@ -27,8 +27,8 @@ spec: - name: traefik image: traefik:v3.0 args: - - --entrypoints.web.address=:80 - - --entrypoints.websecure.address=:443 + - --entryPoints.web.address=:80 + - --entryPoints.websecure.address=:443 - --experimental.kubernetesgateway - --providers.kubernetesgateway diff --git a/docs/content/routing/entrypoints.md b/docs/content/routing/entrypoints.md index 1d8b0b5f5..0678e9a1d 100644 --- a/docs/content/routing/entrypoints.md +++ b/docs/content/routing/entrypoints.md @@ -227,8 +227,8 @@ If both TCP and UDP are wanted for the same port, two entryPoints definitions ar ``` ```bash tab="CLI" - --entrypoints.specificIPv4.address=192.168.2.7:8888 - --entrypoints.specificIPv6.address=[2001:db8::1]:8888 + --entryPoints.specificIPv4.address=192.168.2.7:8888 + --entryPoints.specificIPv6.address=[2001:db8::1]:8888 ``` Full details for how to specify `address` can be found in [net.Listen](https://golang.org/pkg/net/#Listen) (and [net.Dial](https://golang.org/pkg/net/#Dial)) of the doc for go. @@ -270,8 +270,8 @@ reloading the static configuration without any service downtime. ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.web.reusePort=true + --entryPoints.web.address=:80 + --entryPoints.web.reusePort=true ``` Now it is possible to run multiple Traefik processes with the same EntryPoint configuration. @@ -298,10 +298,10 @@ reloading the static configuration without any service downtime. ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.web.reusePort=true - --entrypoints.privateWeb.address=192.168.1.2:80 - --entrypoints.privateWeb.reusePort=true + --entryPoints.web.address=:80 + --entryPoints.web.reusePort=true + --entryPoints.privateWeb.address=192.168.1.2:80 + --entryPoints.privateWeb.reusePort=true ``` Requests to `192.168.1.2:80` will only be handled by routers that have `privateWeb` as the entry point. @@ -349,9 +349,9 @@ EntryPoints in this list are used (by default) on HTTP and TCP routers that do n ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --entrypoints.websecure.asDefault=true + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 + --entryPoints.websecure.asDefault=true ``` ### HTTP/2 @@ -401,7 +401,7 @@ entryPoints: ``` ```bash tab="CLI" ---entrypoints.name.http3 +--entryPoints.name.http3 ``` ??? info "HTTP/3 uses UDP+TLS" @@ -433,7 +433,7 @@ It can be used to override the authority in the `alt-svc` header, for example if ``` ```bash tab="CLI" - --entrypoints.name.http3.advertisedport=443 + --entryPoints.name.http3.advertisedport=443 ``` ### Forwarded Headers @@ -870,10 +870,10 @@ This whole section is dedicated to options, keyed by entry point, that will appl ``` ```bash tab="CLI" - --entrypoints.web.address=:80 - --entrypoints.web.http.redirections.entryPoint.to=websecure - --entrypoints.web.http.redirections.entryPoint.scheme=https - --entrypoints.websecure.address=:443 + --entryPoints.web.address=:80 + --entryPoints.web.http.redirections.entryPoint.to=websecure + --entryPoints.web.http.redirections.entryPoint.scheme=https + --entryPoints.websecure.address=:443 ``` #### `entryPoint` @@ -908,7 +908,7 @@ This section is a convenience to enable (permanent) redirecting of all incoming ``` ```bash tab="CLI" - --entrypoints.foo.http.redirections.entryPoint.to=websecure + --entryPoints.foo.http.redirections.entryPoint.to=websecure ``` ??? info "`entryPoint.scheme`" @@ -938,7 +938,7 @@ This section is a convenience to enable (permanent) redirecting of all incoming ``` ```bash tab="CLI" - --entrypoints.foo.http.redirections.entryPoint.scheme=https + --entryPoints.foo.http.redirections.entryPoint.scheme=https ``` ??? info "`entryPoint.permanent`" @@ -968,7 +968,7 @@ This section is a convenience to enable (permanent) redirecting of all incoming ``` ```bash tab="CLI" - --entrypoints.foo.http.redirections.entrypoint.permanent=true + --entryPoints.foo.http.redirections.entrypoint.permanent=true ``` ??? info "`entryPoint.priority`" @@ -998,7 +998,7 @@ This section is a convenience to enable (permanent) redirecting of all incoming ``` ```bash tab="CLI" - --entrypoints.foo.http.redirections.entrypoint.priority=10 + --entryPoints.foo.http.redirections.entrypoint.priority=10 ``` ### EncodeQuerySemicolons @@ -1026,8 +1026,8 @@ entryPoints: ``` ```bash tab="CLI" ---entrypoints.websecure.address=:443 ---entrypoints.websecure.http.encodequerysemicolons=true +--entryPoints.websecure.address=:443 +--entryPoints.websecure.http.encodequerysemicolons=true ``` #### Examples @@ -1062,8 +1062,8 @@ entryPoints: ``` ```bash tab="CLI" ---entrypoints.websecure.address=:443 ---entrypoints.websecure.http.middlewares=auth@file,strip@file +--entryPoints.websecure.address=:443 +--entryPoints.websecure.http.middlewares=auth@file,strip@file ``` ### TLS @@ -1109,13 +1109,13 @@ entryPoints: ``` ```bash tab="CLI" ---entrypoints.websecure.address=:443 ---entrypoints.websecure.http.tls.options=foobar ---entrypoints.websecure.http.tls.certResolver=leresolver ---entrypoints.websecure.http.tls.domains[0].main=example.com ---entrypoints.websecure.http.tls.domains[0].sans=foo.example.com,bar.example.com ---entrypoints.websecure.http.tls.domains[1].main=test.com ---entrypoints.websecure.http.tls.domains[1].sans=foo.test.com,bar.test.com +--entryPoints.websecure.address=:443 +--entryPoints.websecure.http.tls.options=foobar +--entryPoints.websecure.http.tls.certResolver=leresolver +--entryPoints.websecure.http.tls.domains[0].main=example.com +--entryPoints.websecure.http.tls.domains[0].sans=foo.example.com,bar.example.com +--entryPoints.websecure.http.tls.domains[1].main=test.com +--entryPoints.websecure.http.tls.domains[1].sans=foo.test.com,bar.test.com ``` ??? example "Let's Encrypt" @@ -1138,8 +1138,8 @@ entryPoints: ``` ```bash tab="CLI" - --entrypoints.websecure.address=:443 - --entrypoints.websecure.http.tls.certResolver=leresolver + --entryPoints.websecure.address=:443 + --entryPoints.websecure.http.tls.certResolver=leresolver ``` ## UDP Options @@ -1170,8 +1170,8 @@ entryPoints: ``` ```bash tab="CLI" -entrypoints.foo.address=:8000/udp -entrypoints.foo.udp.timeout=10s +--entryPoints.foo.address=:8000/udp +--entryPoints.foo.udp.timeout=10s ``` {!traefik-for-business-applications.md!} diff --git a/docs/content/routing/providers/kubernetes-crd.md b/docs/content/routing/providers/kubernetes-crd.md index 1c9cabaef..64816c85d 100644 --- a/docs/content/routing/providers/kubernetes-crd.md +++ b/docs/content/routing/providers/kubernetes-crd.md @@ -53,9 +53,9 @@ The Kubernetes Ingress Controller, The Custom Resource Way. - --log.level=DEBUG - --api - --api.insecure - - --entrypoints.web.address=:80 - - --entrypoints.tcpep.address=:8000 - - --entrypoints.udpep.address=:9000/udp + - --entryPoints.web.address=:80 + - --entryPoints.tcpep.address=:8000 + - --entryPoints.udpep.address=:9000/udp - --providers.kubernetescrd ports: - name: web diff --git a/docs/content/routing/providers/kubernetes-gateway.md b/docs/content/routing/providers/kubernetes-gateway.md index a40e18b63..6a5c52c2d 100644 --- a/docs/content/routing/providers/kubernetes-gateway.md +++ b/docs/content/routing/providers/kubernetes-gateway.md @@ -234,7 +234,7 @@ Kubernetes cluster before creating `HTTPRoute` objects. - headers: # [11] name: foo # [12] value: bar # [13] - - backendRefs: # [14] + backendRefs: # [14] - name: whoamitcp # [15] weight: 1 # [16] port: 8080 # [17] @@ -273,7 +273,7 @@ Kubernetes cluster before creating `HTTPRoute` objects. | [6] | `rules` | A list of HTTP matchers, filters and actions. | | [7] | `matches` | Conditions used for matching the rule against incoming HTTP requests. Each match is independent, i.e. this rule will be matched if **any** one of the matches is satisfied. | | [8] | `path` | An HTTP request path matcher. If this field is not specified, a default prefix match on the "/" path is provided. | -| [9] | `type` | Type of match against the path Value (supported types: `Exact`, `Prefix`). | +| [9] | `type` | Type of match against the path Value (supported types: `Exact`, `PathPrefix`). | | [10] | `value` | The value of the HTTP path to match against. | | [11] | `headers` | Conditions to select a HTTP route by matching HTTP request headers. | | [12] | `name` | Name of the HTTP header to be matched. | diff --git a/docs/content/routing/providers/kubernetes-ingress.md b/docs/content/routing/providers/kubernetes-ingress.md index 01f1d5166..6c2342ccb 100644 --- a/docs/content/routing/providers/kubernetes-ingress.md +++ b/docs/content/routing/providers/kubernetes-ingress.md @@ -126,7 +126,7 @@ which in turn will create the resulting routers, services, handlers, etc. - name: traefik image: traefik:v3.0 args: - - --entrypoints.web.address=:80 + - --entryPoints.web.address=:80 - --providers.kubernetesingress ports: - name: web @@ -381,8 +381,8 @@ TLS can be enabled through the [HTTP options](../entrypoints.md#tls) of an Entry ```bash tab="CLI" # Static configuration ---entrypoints.websecure.address=:443 ---entrypoints.websecure.http.tls +--entryPoints.websecure.address=:443 +--entryPoints.websecure.http.tls ``` ```yaml tab="File (YAML)" @@ -514,8 +514,8 @@ This way, any Ingress attached to this Entrypoint will have TLS termination by d - name: traefik image: traefik:v3.0 args: - - --entrypoints.websecure.address=:443 - - --entrypoints.websecure.http.tls + - --entryPoints.websecure.address=:443 + - --entryPoints.websecure.http.tls - --providers.kubernetesingress ports: - name: websecure @@ -700,7 +700,7 @@ For more options, please refer to the available [annotations](#on-ingress). - name: traefik image: traefik:v3.0 args: - - --entrypoints.websecure.address=:443 + - --entryPoints.websecure.address=:443 - --providers.kubernetesingress ports: - name: websecure diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index 884487693..9cec6aaee 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -146,9 +146,9 @@ If you want to limit the router scope to a set of entry points, set the `entryPo ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --entrypoints.other.address=:9090 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 + --entryPoints.other.address=:9090 ``` ??? example "Listens to Specific EntryPoints" @@ -204,9 +204,9 @@ If you want to limit the router scope to a set of entry points, set the `entryPo ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --entrypoints.other.address=:9090 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 + --entryPoints.other.address=:9090 ``` ### Rule @@ -959,9 +959,9 @@ If you want to limit the router scope to a set of entry points, set the entry po ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --entrypoints.other.address=:9090 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 + --entryPoints.other.address=:9090 ``` ??? example "Listens to Specific EntryPoints" @@ -1023,9 +1023,9 @@ If you want to limit the router scope to a set of entry points, set the entry po ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=:80 - --entrypoints.websecure.address=:443 - --entrypoints.other.address=:9090 + --entryPoints.web.address=:80 + --entryPoints.websecure.address=:443 + --entryPoints.other.address=:9090 ``` ### Rule @@ -1610,9 +1610,9 @@ If one wants to limit the router scope to a set of EntryPoints, one should set t ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=":80" - --entrypoints.other.address=":9090/udp" - --entrypoints.streaming.address=":9191/udp" + --entryPoints.web.address=":80" + --entryPoints.other.address=":9090/udp" + --entryPoints.streaming.address=":9191/udp" ``` ??? example "Listens to Specific EntryPoints" @@ -1667,9 +1667,9 @@ If one wants to limit the router scope to a set of EntryPoints, one should set t ```bash tab="CLI" ## Static configuration - --entrypoints.web.address=":80" - --entrypoints.other.address=":9090/udp" - --entrypoints.streaming.address=":9191/udp" + --entryPoints.web.address=":80" + --entryPoints.other.address=":9090/udp" + --entryPoints.streaming.address=":9191/udp" ``` ### Services diff --git a/docs/content/user-guides/crd-acme/03-deployments.yml b/docs/content/user-guides/crd-acme/03-deployments.yml index 57f6da6d0..900bd6e09 100644 --- a/docs/content/user-guides/crd-acme/03-deployments.yml +++ b/docs/content/user-guides/crd-acme/03-deployments.yml @@ -30,8 +30,8 @@ spec: args: - --api.insecure - --accesslog - - --entrypoints.web.Address=:8000 - - --entrypoints.websecure.Address=:4443 + - --entryPoints.web.Address=:8000 + - --entryPoints.websecure.Address=:4443 - --providers.kubernetescrd - --certificatesresolvers.myresolver.acme.tlschallenge - --certificatesresolvers.myresolver.acme.email=foo@you.com diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml index 9a6307ad3..0ab94dd66 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose.yml @@ -10,8 +10,8 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--entrypoints.websecure.address=:443" + - "--entryPoints.web.address=:80" + - "--entryPoints.websecure.address=:443" - "--certificatesresolvers.myresolver.acme.dnschallenge=true" - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" diff --git a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml index 46e04acbe..b12ec108e 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml +++ b/docs/content/user-guides/docker-compose/acme-dns/docker-compose_secrets.yml @@ -20,8 +20,8 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--entrypoints.websecure.address=:443" + - "--entryPoints.web.address=:80" + - "--entryPoints.websecure.address=:443" - "--certificatesresolvers.myresolver.acme.dnschallenge=true" - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" diff --git a/docs/content/user-guides/docker-compose/acme-dns/index.md b/docs/content/user-guides/docker-compose/acme-dns/index.md index 84fc9c8dc..d312b79d9 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/index.md +++ b/docs/content/user-guides/docker-compose/acme-dns/index.md @@ -64,7 +64,7 @@ What changed between the initial setup: ```yaml command: # Traefik will listen to incoming request on the port 443 (https) - - "--entrypoints.websecure.address=:443" + - "--entryPoints.websecure.address=:443" ports: - "443:443" ``` diff --git a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml index 3d888789c..bd0a0537e 100644 --- a/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-http/docker-compose.yml @@ -10,8 +10,8 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--entrypoints.websecure.address=:443" + - "--entryPoints.web.address=:80" + - "--entryPoints.websecure.address=:443" - "--certificatesresolvers.myresolver.acme.httpchallenge=true" - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" diff --git a/docs/content/user-guides/docker-compose/acme-http/index.md b/docs/content/user-guides/docker-compose/acme-http/index.md index 67808853e..f6d5e0fc2 100644 --- a/docs/content/user-guides/docker-compose/acme-http/index.md +++ b/docs/content/user-guides/docker-compose/acme-http/index.md @@ -50,7 +50,7 @@ What changed between the basic example: ```yaml command: # Traefik will listen to incoming request on the port 443 (https) - - "--entrypoints.websecure.address=:443" + - "--entryPoints.websecure.address=:443" ports: - "443:443" ``` diff --git a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml index 52e4ff869..9e0fe5e30 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/acme-tls/docker-compose.yml @@ -10,7 +10,7 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--entrypoints.websecure.address=:443" + - "--entryPoints.websecure.address=:443" - "--certificatesresolvers.myresolver.acme.tlschallenge=true" #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - "--certificatesresolvers.myresolver.acme.email=postmaster@example.com" diff --git a/docs/content/user-guides/docker-compose/acme-tls/index.md b/docs/content/user-guides/docker-compose/acme-tls/index.md index b201a4c95..9e6e6ac4a 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/index.md +++ b/docs/content/user-guides/docker-compose/acme-tls/index.md @@ -50,7 +50,7 @@ What changed between the basic example: ```yaml command: # Traefik will listen to incoming request on the port 443 (https) - - "--entrypoints.websecure.address=:443" + - "--entryPoints.websecure.address=:443" ports: - "443:443" ``` diff --git a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml index a17cddc9f..d8c421072 100644 --- a/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml +++ b/docs/content/user-guides/docker-compose/basic-example/docker-compose.yml @@ -10,7 +10,7 @@ services: - "--api.insecure=true" - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" + - "--entryPoints.web.address=:80" ports: - "80:80" - "8080:8080" diff --git a/docs/content/user-guides/docker-compose/basic-example/index.md b/docs/content/user-guides/docker-compose/basic-example/index.md index dff9d635e..b36e3bbdc 100644 --- a/docs/content/user-guides/docker-compose/basic-example/index.md +++ b/docs/content/user-guides/docker-compose/basic-example/index.md @@ -86,7 +86,7 @@ Second, you define an entry point, along with the exposure of the matching port ```yaml command: # Traefik will listen to incoming request on the port 80 (HTTP) - - "--entrypoints.web.address=:80" + - "--entryPoints.web.address=:80" ports: - "80:80" diff --git a/webui/src/components/dashboard/PanelProvider.vue b/webui/src/components/dashboard/PanelProvider.vue index 28332b0bf..7b9fe8594 100644 --- a/webui/src/components/dashboard/PanelProvider.vue +++ b/webui/src/components/dashboard/PanelProvider.vue @@ -6,7 +6,7 @@
-