From beec65938e1b8f296d2c5b8cf6ae7ec5a76ab223 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 17 Feb 2020 11:04:04 +0100 Subject: [PATCH] Improve documentation. --- cmd/traefik/traefik.go | 4 +- .../getting-started/configuration-overview.md | 2 +- .../getting-started/install-traefik.md | 6 +- docs/content/getting-started/quick-start.md | 4 +- docs/content/https/acme.md | 96 ++++----- .../include-acme-multiple-domains-example.md | 14 +- ...acme-multiple-domains-from-rule-example.md | 14 +- .../include-acme-single-domain-example.md | 14 +- docs/content/https/ref-acme.toml | 8 +- docs/content/https/ref-acme.txt | 24 +-- docs/content/https/ref-acme.yaml | 2 +- docs/content/middlewares/redirectscheme.md | 196 +++++++++++++++++- docs/content/migration/v1-to-v2.md | 16 +- docs/content/providers/docker.md | 2 +- docs/content/providers/kubernetes-ingress.md | 35 +++- .../user-guides/crd-acme/03-deployments.yml | 10 +- .../user-guides/crd-acme/04-ingressroutes.yml | 2 +- docs/content/user-guides/crd-acme/k3s.yml | 2 +- .../acme-dns/docker-compose.yml | 14 +- .../acme-dns/docker-compose_secrets.yml | 14 +- .../docker-compose/acme-dns/index.md | 20 +- .../acme-http/docker-compose.yml | 14 +- .../docker-compose/acme-http/index.md | 18 +- .../acme-tls/docker-compose.yml | 12 +- .../docker-compose/acme-tls/index.md | 14 +- .../basic-example/docker-compose.yml | 2 +- 26 files changed, 374 insertions(+), 185 deletions(-) diff --git a/cmd/traefik/traefik.go b/cmd/traefik/traefik.go index bc7a3ae7c..23ce8dbaf 100644 --- a/cmd/traefik/traefik.go +++ b/cmd/traefik/traefik.go @@ -408,13 +408,13 @@ func stats(staticConfiguration *static.Configuration) { logger.Info(`Stats collection is enabled.`) logger.Info(`Many thanks for contributing to Traefik's improvement by allowing us to receive anonymous information from your configuration.`) logger.Info(`Help us improve Traefik by leaving this feature on :)`) - logger.Info(`More details on: https://docs.traefik.io/v2.0/contributing/data-collection/`) + logger.Info(`More details on: https://docs.traefik.io/contributing/data-collection/`) collect(staticConfiguration) } else { logger.Info(` Stats collection is disabled. Help us improve Traefik by turning this feature on :) -More details on: https://docs.traefik.io/v2.0/contributing/data-collection/ +More details on: https://docs.traefik.io/contributing/data-collection/ `) } } diff --git a/docs/content/getting-started/configuration-overview.md b/docs/content/getting-started/configuration-overview.md index 581a60a03..58ff72e00 100644 --- a/docs/content/getting-started/configuration-overview.md +++ b/docs/content/getting-started/configuration-overview.md @@ -74,7 +74,7 @@ traefik --help # or docker run traefik[:version] --help -# ex: docker run traefik:2.0 --help +# ex: docker run traefik:2.1 --help ``` All available arguments can also be found [here](../reference/static-configuration/cli.md). diff --git a/docs/content/getting-started/install-traefik.md b/docs/content/getting-started/install-traefik.md index ae9ceef34..0e9a206ce 100644 --- a/docs/content/getting-started/install-traefik.md +++ b/docs/content/getting-started/install-traefik.md @@ -9,11 +9,11 @@ You can install Traefik with the following flavors: ## Use the Official Docker Image -Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.0/traefik.sample.toml): +Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v2.1/traefik.sample.toml): ```bash docker run -d -p 8080:8080 -p 80:80 \ - -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.0 + -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.1 ``` For more details, go to the [Docker provider documentation](../providers/docker.md) @@ -21,7 +21,7 @@ For more details, go to the [Docker provider documentation](../providers/docker. !!! tip * Prefer a fixed version than the latest that could be an unexpected version. - ex: `traefik:v2.0.0` + ex: `traefik:v2.1.4` * Docker images are based from the [Alpine Linux Official image](https://hub.docker.com/_/alpine). * Any orchestrator using docker images can fetch the official Traefik docker image. diff --git a/docs/content/getting-started/quick-start.md b/docs/content/getting-started/quick-start.md index e629763ec..cc4fc49a6 100644 --- a/docs/content/getting-started/quick-start.md +++ b/docs/content/getting-started/quick-start.md @@ -14,8 +14,8 @@ version: '3' services: reverse-proxy: - # The official v2.0 Traefik docker image - image: traefik:v2.0 + # The official v2 Traefik docker image + image: traefik:v2.1 # Enables the web UI and tells Traefik to listen to docker command: --api.insecure=true --providers.docker ports: diff --git a/docs/content/https/acme.md b/docs/content/https/acme.md index 6949bba65..47d6eb6b5 100644 --- a/docs/content/https/acme.md +++ b/docs/content/https/acme.md @@ -23,6 +23,25 @@ Certificates are requested for domain names retrieved from the router's [dynamic You can read more about this retrieval mechanism in the following section: [ACME Domain Definition](#domain-definition). +!!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." + +??? note "Configuration Reference" + + There are many available options for ACME. + For a quick glance at what's possible, browse the configuration reference: + + ```toml tab="File (TOML)" + --8<-- "content/https/ref-acme.toml" + ``` + + ```yaml tab="File (YAML)" + --8<-- "content/https/ref-acme.yaml" + ``` + + ```bash tab="CLI" + --8<-- "content/https/ref-acme.txt" + ``` + ## Domain Definition Certificate resolvers request certificates for a set of the domain names @@ -59,10 +78,10 @@ Please check the [configuration examples below](#configuration-examples) for mor [entryPoints.websecure] address = ":443" - [certificatesResolvers.le.acme] + [certificatesResolvers.myresolver.acme] email = "your-email@your-domain.org" storage = "acme.json" - [certificatesResolvers.le.acme.httpChallenge] + [certificatesResolvers.myresolver.acme.httpChallenge] # used during the challenge entryPoint = "web" ``` @@ -76,7 +95,7 @@ Please check the [configuration examples below](#configuration-examples) for mor address: ":443" certificatesResolvers: - sample: + myresolver: acme: email: your-email@your-domain.org storage: acme.json @@ -89,31 +108,14 @@ Please check the [configuration examples below](#configuration-examples) for mor --entryPoints.web.address=:80 --entryPoints.websecure.address=:443 # ... - --certificatesResolvers.le.acme.email=your-email@your-domain.org - --certificatesResolvers.le.acme.storage=acme.json + --certificatesResolvers.myresolver.acme.email=your-email@your-domain.org + --certificatesResolvers.myresolver.acme.storage=acme.json # used during the challenge - --certificatesResolvers.le.acme.httpChallenge.entryPoint=web + --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web ``` !!! important "Defining a certificates resolver does not result in all routers automatically using it. Each router that is supposed to use the resolver must [reference](../routing/routers/index.md#certresolver) it." -??? note "Configuration Reference" - - There are many available options for ACME. - For a quick glance at what's possible, browse the configuration reference: - - ```toml tab="File (TOML)" - --8<-- "content/https/ref-acme.toml" - ``` - - ```yaml tab="File (YAML)" - --8<-- "content/https/ref-acme.yaml" - ``` - - ```bash tab="CLI" - --8<-- "content/https/ref-acme.txt" - ``` - ??? example "Single Domain from Router's Rule Example" * A certificate for the domain `company.com` is requested: @@ -164,14 +166,14 @@ when using the `TLS-ALPN-01` challenge, Traefik must be reachable by Let's Encry ??? example "Configuring the `tlsChallenge`" ```toml tab="File (TOML)" - [certificatesResolvers.le.acme] + [certificatesResolvers.myresolver.acme] # ... - [certificatesResolvers.le.acme.tlsChallenge] + [certificatesResolvers.myresolver.acme.tlsChallenge] ``` ```yaml tab="File (YAML)" certificatesResolvers: - sample: + myresolver: acme: # ... tlsChallenge: {} @@ -179,7 +181,7 @@ when using the `TLS-ALPN-01` challenge, Traefik must be reachable by Let's Encry ```bash tab="CLI" # ... - --certificatesResolvers.le.acme.tlsChallenge=true + --certificatesResolvers.myresolver.acme.tlsChallenge=true ``` ### `httpChallenge` @@ -187,7 +189,7 @@ when using the `TLS-ALPN-01` challenge, Traefik must be reachable by Let's Encry Use the `HTTP-01` challenge to generate and renew ACME certificates by provisioning an HTTP resource under a well-known URI. As described on the Let's Encrypt [community forum](https://community.letsencrypt.org/t/support-for-ports-other-than-80-and-443/3419/72), -when using the `HTTP-01` challenge, `certificatesResolvers.le.acme.httpChallenge.entryPoint` must be reachable by Let's Encrypt through port 80. +when using the `HTTP-01` challenge, `certificatesResolvers.myresolver.acme.httpChallenge.entryPoint` must be reachable by Let's Encrypt through port 80. ??? example "Using an EntryPoint Called http for the `httpChallenge`" @@ -199,9 +201,9 @@ when using the `HTTP-01` challenge, `certificatesResolvers.le.acme.httpChallenge [entryPoints.websecure] address = ":443" - [certificatesResolvers.le.acme] + [certificatesResolvers.myresolver.acme] # ... - [certificatesResolvers.le.acme.httpChallenge] + [certificatesResolvers.myresolver.acme.httpChallenge] entryPoint = "web" ``` @@ -214,7 +216,7 @@ when using the `HTTP-01` challenge, `certificatesResolvers.le.acme.httpChallenge address: ":443" certificatesResolvers: - sample: + myresolver: acme: # ... httpChallenge: @@ -225,7 +227,7 @@ when using the `HTTP-01` challenge, `certificatesResolvers.le.acme.httpChallenge --entryPoints.web.address=:80 --entryPoints.websecure.address=:443 # ... - --certificatesResolvers.le.acme.httpChallenge.entryPoint=web + --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web ``` !!! info "" @@ -238,9 +240,9 @@ Use the `DNS-01` challenge to generate and renew ACME certificates by provisioni ??? example "Configuring a `dnsChallenge` with the DigitalOcean Provider" ```toml tab="File (TOML)" - [certificatesResolvers.le.acme] + [certificatesResolvers.myresolver.acme] # ... - [certificatesResolvers.le.acme.dnsChallenge] + [certificatesResolvers.myresolver.acme.dnsChallenge] provider = "digitalocean" delayBeforeCheck = 0 # ... @@ -248,7 +250,7 @@ Use the `DNS-01` challenge to generate and renew ACME certificates by provisioni ```yaml tab="File (YAML)" certificatesResolvers: - sample: + myresolver: acme: # ... dnsChallenge: @@ -259,8 +261,8 @@ Use the `DNS-01` challenge to generate and renew ACME certificates by provisioni ```bash tab="CLI" # ... - --certificatesResolvers.le.acme.dnsChallenge.provider=digitalocean - --certificatesResolvers.le.acme.dnsChallenge.delayBeforeCheck=0 + --certificatesResolvers.myresolver.acme.dnsChallenge.provider=digitalocean + --certificatesResolvers.myresolver.acme.dnsChallenge.delayBeforeCheck=0 # ... ``` @@ -358,16 +360,16 @@ For example, `CF_API_EMAIL_FILE=/run/secrets/traefik_cf-api-email` could be used Use custom DNS servers to resolve the FQDN authority. ```toml tab="File (TOML)" -[certificatesResolvers.le.acme] +[certificatesResolvers.myresolver.acme] # ... - [certificatesResolvers.le.acme.dnsChallenge] + [certificatesResolvers.myresolver.acme.dnsChallenge] # ... resolvers = ["1.1.1.1:53", "8.8.8.8:53"] ``` ```yaml tab="File (YAML)" certificatesResolvers: - sample: + myresolver: acme: # ... dnsChallenge: @@ -379,7 +381,7 @@ certificatesResolvers: ```bash tab="CLI" # ... ---certificatesResolvers.le.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53 +--certificatesResolvers.myresolver.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53 ``` #### Wildcard Domains @@ -394,7 +396,7 @@ As described in [Let's Encrypt's post](https://community.letsencrypt.org/t/stagi ??? example "Using the Let's Encrypt staging server" ```toml tab="File (TOML)" - [certificatesResolvers.le.acme] + [certificatesResolvers.myresolver.acme] # ... caServer = "https://acme-staging-v02.api.letsencrypt.org/directory" # ... @@ -402,7 +404,7 @@ As described in [Let's Encrypt's post](https://community.letsencrypt.org/t/stagi ```yaml tab="File (YAML)" certificatesResolvers: - sample: + myresolver: acme: # ... caServer: https://acme-staging-v02.api.letsencrypt.org/directory @@ -411,7 +413,7 @@ As described in [Let's Encrypt's post](https://community.letsencrypt.org/t/stagi ```bash tab="CLI" # ... - --certificatesResolvers.le.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory + --certificatesResolvers.myresolver.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory # ... ``` @@ -420,7 +422,7 @@ As described in [Let's Encrypt's post](https://community.letsencrypt.org/t/stagi The `storage` option sets the location where your ACME certificates are saved to. ```toml tab="File (TOML)" -[certificatesResolvers.le.acme] +[certificatesResolvers.myresolver.acme] # ... storage = "acme.json" # ... @@ -428,7 +430,7 @@ The `storage` option sets the location where your ACME certificates are saved to ```yaml tab="File (YAML)" certificatesResolvers: - sample: + myresolver: acme: # ... storage: acme.json @@ -437,7 +439,7 @@ certificatesResolvers: ```bash tab="CLI" # ... ---certificatesResolvers.le.acme.storage=acme.json +--certificatesResolvers.myresolver.acme.storage=acme.json # ... ``` diff --git a/docs/content/https/include-acme-multiple-domains-example.md b/docs/content/https/include-acme-multiple-domains-example.md index 0c4832105..2a628e035 100644 --- a/docs/content/https/include-acme-multiple-domains-example.md +++ b/docs/content/https/include-acme-multiple-domains-example.md @@ -4,7 +4,7 @@ labels: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver - traefik.http.routers.blog.tls.domains[0].main=company.org - traefik.http.routers.blog.tls.domains[0].sans=*.company.org ``` @@ -16,7 +16,7 @@ deploy: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.services.blog-svc.loadbalancer.server.port=8080" - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver - traefik.http.routers.blog.tls.domains[0].main=company.org - traefik.http.routers.blog.tls.domains[0].sans=*.company.org ``` @@ -36,14 +36,14 @@ spec: - name: blog port: 8080 tls: - certResolver: le + certResolver: myresolver ``` ```json tab="Marathon" labels: { "traefik.http.routers.blog.rule": "Host(`company.com`) && Path(`/blog`)", "traefik.http.routers.blog.tls": "true", - "traefik.http.routers.blog.tls.certresolver": "le", + "traefik.http.routers.blog.tls.certresolver": "myresolver", "traefik.http.routers.blog.tls.domains[0].main": "company.com", "traefik.http.routers.blog.tls.domains[0].sans": "*.company.com", "traefik.http.services.blog-svc.loadbalancer.server.port": "8080" @@ -55,7 +55,7 @@ labels: { labels: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver - traefik.http.routers.blog.tls.domains[0].main=company.org - traefik.http.routers.blog.tls.domains[0].sans=*.company.org ``` @@ -66,7 +66,7 @@ labels: [http.routers.blog] rule = "Host(`company.com`) && Path(`/blog`)" [http.routers.blog.tls] - certResolver = "le" # From static configuration + certResolver = "myresolver" # From static configuration [[http.routers.blog.tls.domains]] main = "company.org" sans = ["*.company.org"] @@ -79,7 +79,7 @@ http: blog: rule: "Host(`company.com`) && Path(`/blog`)" tls: - certResolver: le + certResolver: myresolver domains: - main: "company.org" sans: diff --git a/docs/content/https/include-acme-multiple-domains-from-rule-example.md b/docs/content/https/include-acme-multiple-domains-from-rule-example.md index 26ad0ed6d..de850bd6b 100644 --- a/docs/content/https/include-acme-multiple-domains-from-rule-example.md +++ b/docs/content/https/include-acme-multiple-domains-from-rule-example.md @@ -4,7 +4,7 @@ labels: - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver ``` ```yaml tab="Docker (Swarm)" @@ -13,7 +13,7 @@ deploy: labels: - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver - traefik.http.services.blog-svc.loadbalancer.server.port=8080" ``` @@ -32,14 +32,14 @@ spec: - name: blog port: 8080 tls: - certresolver: le + certresolver: myresolver ``` ```json tab="Marathon" labels: { "traefik.http.routers.blog.rule": "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)", "traefik.http.routers.blog.tls": "true", - "traefik.http.routers.blog.tls.certresolver": "le", + "traefik.http.routers.blog.tls.certresolver": "myresolver", "traefik.http.services.blog-svc.loadbalancer.server.port": "8080" } ``` @@ -49,7 +49,7 @@ labels: { labels: - traefik.http.routers.blog.rule=(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver ``` ```toml tab="File (TOML)" @@ -58,7 +58,7 @@ labels: [http.routers.blog] rule = "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)" [http.routers.blog.tls] - certResolver = "le" + certResolver = "myresolver" ``` ```yaml tab="File (YAML)" @@ -68,5 +68,5 @@ http: blog: rule: "(Host(`company.com`) && Path(`/blog`)) || Host(`blog.company.org`)" tls: - certResolver: le + certResolver: myresolver ``` diff --git a/docs/content/https/include-acme-single-domain-example.md b/docs/content/https/include-acme-single-domain-example.md index 41fff7c44..2b4bad098 100644 --- a/docs/content/https/include-acme-single-domain-example.md +++ b/docs/content/https/include-acme-single-domain-example.md @@ -4,7 +4,7 @@ labels: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver ``` ```yaml tab="Docker (Swarm)" @@ -13,7 +13,7 @@ deploy: labels: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver - traefik.http.services.blog-svc.loadbalancer.server.port=8080" ``` @@ -32,14 +32,14 @@ spec: - name: blog port: 8080 tls: - certresolver: le + certresolver: myresolver ``` ```json tab="Marathon" labels: { "traefik.http.routers.blog.rule": "Host(`company.com`) && Path(`/blog`)", "traefik.http.routers.blog.tls": "true", - "traefik.http.routers.blog.tls.certresolver": "le", + "traefik.http.routers.blog.tls.certresolver": "myresolver", "traefik.http.services.blog-svc.loadbalancer.server.port": "8080" } ``` @@ -49,7 +49,7 @@ labels: { labels: - traefik.http.routers.blog.rule=Host(`company.com`) && Path(`/blog`) - traefik.http.routers.blog.tls=true - - traefik.http.routers.blog.tls.certresolver=le + - traefik.http.routers.blog.tls.certresolver=myresolver ``` ```toml tab="Single Domain" @@ -58,7 +58,7 @@ labels: [http.routers.blog] rule = "Host(`company.com`) && Path(`/blog`)" [http.routers.blog.tls] - certResolver = "le" + certResolver = "myresolver" ``` ```yaml tab="File (YAML)" @@ -68,5 +68,5 @@ http: blog: rule: "Host(`company.com`) && Path(`/blog`)" tls: - certResolver: le + certResolver: myresolver ``` diff --git a/docs/content/https/ref-acme.toml b/docs/content/https/ref-acme.toml index 5b509fee6..bb8050529 100644 --- a/docs/content/https/ref-acme.toml +++ b/docs/content/https/ref-acme.toml @@ -1,5 +1,5 @@ # Enable ACME (Let's Encrypt): automatic SSL. -[certificatesResolvers.sample.acme] +[certificatesResolvers.myresolver.acme] # Email address used for registration. # @@ -35,13 +35,13 @@ # # Optional (but recommended) # - [certificatesResolvers.le.acme.tlsChallenge] + [certificatesResolvers.myresolver.acme.tlsChallenge] # Use a HTTP-01 ACME challenge. # # Optional # - # [certificatesResolvers.le.acme.httpChallenge] + # [certificatesResolvers.myresolver.acme.httpChallenge] # EntryPoint to use for the HTTP-01 challenges. # @@ -54,7 +54,7 @@ # # Optional # - # [certificatesResolvers.le.acme.dnsChallenge] + # [certificatesResolvers.myresolver.acme.dnsChallenge] # DNS provider used. # diff --git a/docs/content/https/ref-acme.txt b/docs/content/https/ref-acme.txt index be321d336..96b26a4b1 100644 --- a/docs/content/https/ref-acme.txt +++ b/docs/content/https/ref-acme.txt @@ -4,13 +4,13 @@ # # Required # ---certificatesResolvers.le.acme.email=test@traefik.io +--certificatesResolvers.myresolver.acme.email=test@traefik.io # File or key used for certificates storage. # # Required # ---certificatesResolvers.le.acme.storage=acme.json +--certificatesResolvers.myresolver.acme.storage=acme.json # CA server to use. # Uncomment the line to use Let's Encrypt's staging server, @@ -19,7 +19,7 @@ # Optional # Default: "https://acme-v02.api.letsencrypt.org/directory" # ---certificatesResolvers.le.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory +--certificatesResolvers.myresolver.acme.caServer=https://acme-staging-v02.api.letsencrypt.org/directory # KeyType to use. # @@ -28,38 +28,38 @@ # # Available values : "EC256", "EC384", "RSA2048", "RSA4096", "RSA8192" # ---certificatesResolvers.le.acme.keyType=RSA4096 +--certificatesResolvers.myresolver.acme.keyType=RSA4096 # Use a TLS-ALPN-01 ACME challenge. # # Optional (but recommended) # ---certificatesResolvers.le.acme.tlsChallenge=true +--certificatesResolvers.myresolver.acme.tlsChallenge=true # Use a HTTP-01 ACME challenge. # # Optional # ---certificatesResolvers.le.acme.httpChallenge=true +--certificatesResolvers.myresolver.acme.httpChallenge=true # EntryPoint to use for the HTTP-01 challenges. # # Required # ---certificatesResolvers.le.acme.httpChallenge.entryPoint=web +--certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web # Use a DNS-01 ACME challenge rather than HTTP-01 challenge. # Note: mandatory for wildcard certificate generation. # # Optional # ---certificatesResolvers.le.acme.dnsChallenge=true +--certificatesResolvers.myresolver.acme.dnsChallenge=true # DNS provider used. # # Required # ---certificatesResolvers.le.acme.dnsChallenge.provider=digitalocean +--certificatesResolvers.myresolver.acme.dnsChallenge.provider=digitalocean # By default, the provider will verify the TXT DNS challenge record before letting ACME verify. # If delayBeforeCheck is greater than zero, this check is delayed for the configured duration in seconds. @@ -68,14 +68,14 @@ # Optional # Default: 0 # ---certificatesResolvers.le.acme.dnsChallenge.delayBeforeCheck=0 +--certificatesResolvers.myresolver.acme.dnsChallenge.delayBeforeCheck=0 # Use following DNS servers to resolve the FQDN authority. # # Optional # Default: empty # ---certificatesResolvers.le.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53 +--certificatesResolvers.myresolver.acme.dnsChallenge.resolvers=1.1.1.1:53,8.8.8.8:53 # Disable the DNS propagation checks before notifying ACME that the DNS challenge is ready. # @@ -85,4 +85,4 @@ # Optional # Default: false # ---certificatesResolvers.le.acme.dnsChallenge.disablePropagationCheck=true +--certificatesResolvers.myresolver.acme.dnsChallenge.disablePropagationCheck=true diff --git a/docs/content/https/ref-acme.yaml b/docs/content/https/ref-acme.yaml index 1dc34ece4..08399f90c 100644 --- a/docs/content/https/ref-acme.yaml +++ b/docs/content/https/ref-acme.yaml @@ -1,5 +1,5 @@ certificatesResolvers: - le: + myresolver: # Enable ACME (Let's Encrypt): automatic SSL. acme: diff --git a/docs/content/middlewares/redirectscheme.md b/docs/content/middlewares/redirectscheme.md index a67c2cf81..144007563 100644 --- a/docs/content/middlewares/redirectscheme.md +++ b/docs/content/middlewares/redirectscheme.md @@ -11,6 +11,132 @@ RedirectScheme redirect request from a scheme to another. ## Configuration Examples +```yaml tab="Docker" +# Redirect to https +labels: + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https" + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```yaml tab="Kubernetes" +# Redirect to https +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: test-redirectscheme +spec: + redirectScheme: + scheme: https + permanent: true +``` + +```yaml tab="Consul Catalog" +# Redirect to https +labels: + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https" + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```json tab="Marathon" +"labels": { + "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme": "https" + "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent": "true" +} +``` + +```yaml tab="Rancher" +# Redirect to https +labels: + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https" + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```toml tab="File (TOML)" +# Redirect to https +[http.middlewares] + [http.middlewares.test-redirectscheme.redirectScheme] + scheme = "https" + permanent = true +``` + +```yaml tab="File (YAML)" +# Redirect to https +http: + middlewares: + test-redirectscheme: + redirectScheme: + scheme: https + permanent: true +``` + +## Configuration Options + +### `permanent` + +Set the `permanent` option to `true` to apply a permanent redirection. + +```yaml tab="Docker" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```yaml tab="Kubernetes" +# Redirect to https +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: test-redirectscheme +spec: + redirectScheme: + # ... + permanent: true +``` + +```yaml tab="Consul Catalog" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```json tab="Marathon" +"labels": { + + "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent": "true" +} +``` + +```yaml tab="Rancher" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true" +``` + +```toml tab="File (TOML)" +# Redirect to https +[http.middlewares] + [http.middlewares.test-redirectscheme.redirectScheme] + # ... + permanent = true +``` + +```yaml tab="File (YAML)" +# Redirect to https +http: + middlewares: + test-redirectscheme: + redirectScheme: + # ... + permanent: true +``` + +### `scheme` + +The `scheme` option defines the scheme of the new url. + ```yaml tab="Docker" # Redirect to https labels: @@ -31,7 +157,7 @@ spec: ```yaml tab="Consul Catalog" # Redirect to https labels: -- "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https" + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https" ``` ```json tab="Marathon" @@ -62,16 +188,64 @@ http: scheme: https ``` -## Configuration Options - -### `permanent` - -Set the `permanent` option to `true` to apply a permanent redirection. - -### `scheme` - -The `scheme` option defines the scheme of the new url. - ### `port` The `port` option defines the port of the new url. + +```yaml tab="Docker" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.port=443" +``` + +```yaml tab="Kubernetes" +# Redirect to https +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: test-redirectscheme +spec: + redirectScheme: + # ... + port: 443 +``` + +```yaml tab="Consul Catalog" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.port=443" +``` + +```json tab="Marathon" +"labels": { + + "traefik.http.middlewares.test-redirectscheme.redirectscheme.port": "443" +} +``` + +```yaml tab="Rancher" +# Redirect to https +labels: + # ... + - "traefik.http.middlewares.test-redirectscheme.redirectscheme.port=443" +``` + +```toml tab="File (TOML)" +# Redirect to https +[http.middlewares] + [http.middlewares.test-redirectscheme.redirectScheme] + # ... + port = 443 +``` + +```yaml tab="File (YAML)" +# Redirect to https +http: + middlewares: + test-redirectscheme: + redirectScheme: + # ... + port: 443 +``` diff --git a/docs/content/migration/v1-to-v2.md b/docs/content/migration/v1-to-v2.md index a507bd904..cfe8086a4 100644 --- a/docs/content/migration/v1-to-v2.md +++ b/docs/content/migration/v1-to-v2.md @@ -681,7 +681,7 @@ To apply a redirection, one of the redirect middlewares, [RedirectRegex](../midd With the new core notions of v2 (introduced earlier in the section ["Frontends and Backends Are Dead... Long Live Routers, Middlewares, and Services"](#frontends-and-backends-are-dead-long-live-routers-middlewares-and-services)), transforming the URL path prefix of incoming requests is configured with [middlewares](../middlewares/overview.md), -after the routing step with [router rule `PathPrefix`](https://docs.traefik.io/v2.0/routing/routers/#rule). +after the routing step with [router rule `PathPrefix`](../routing/routers/index.md#rule). Use Case: Incoming requests to `http://company.org/admin` are forwarded to the webapplication "admin", with the path `/admin` stripped, e.g. to `http://:/`. In this case, you must: @@ -826,7 +826,7 @@ with the path `/admin` stripped, e.g. to `http://:/`. In this case, yo entryPoint = "webs" [entryPoints.websecure] address = ":443" - [entryPoints.https.tls] + [entryPoints.websecure.tls] [acme] email = "your-email-here@my-awesome-app.org" @@ -859,10 +859,10 @@ with the path `/admin` stripped, e.g. to `http://:/`. In this case, yo [entryPoints.websecure] address = ":443" - [certificatesResolvers.sample.acme] + [certificatesResolvers.myresolver.acme] email = "your-email@your-domain.org" storage = "acme.json" - [certificatesResolvers.sample.acme.httpChallenge] + [certificatesResolvers.myresolver.acme.httpChallenge] # used during the challenge entryPoint = "web" ``` @@ -876,7 +876,7 @@ with the path `/admin` stripped, e.g. to `http://:/`. In this case, yo address: ":443" certificatesResolvers: - sample: + myresolver: acme: email: your-email@your-domain.org storage: acme.json @@ -888,9 +888,9 @@ with the path `/admin` stripped, e.g. to `http://:/`. In this case, yo ```bash tab="CLI" --entryPoints.web.address=:80 --entryPoints.websecure.address=:443 - --certificatesResolvers.sample.acme.email=your-email@your-domain.org - --certificatesResolvers.sample.acme.storage=acme.json - --certificatesResolvers.sample.acme.httpChallenge.entryPoint=web + --certificatesResolvers.myresolver.acme.email=your-email@your-domain.org + --certificatesResolvers.myresolver.acme.storage=acme.json + --certificatesResolvers.myresolver.acme.httpChallenge.entryPoint=web ``` ## Traefik Logs diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 6ac8cecb7..5151872a0 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -246,7 +246,7 @@ See the sections [Docker API Access](#docker-api-access) and [Docker Swarm API A services: traefik: - image: traefik:v2.0 # The official v2.0 Traefik docker image + image: traefik:v2.1 # The official v2 Traefik docker image ports: - "80:80" volumes: diff --git a/docs/content/providers/kubernetes-ingress.md b/docs/content/providers/kubernetes-ingress.md index 2a269863a..1463f64e4 100644 --- a/docs/content/providers/kubernetes-ingress.md +++ b/docs/content/providers/kubernetes-ingress.md @@ -23,7 +23,9 @@ providers: --providers.kubernetesingress=true ``` -The provider then watches for incoming ingresses events, such as the example below, and derives the corresponding dynamic configuration from it, which in turn will create the resulting routers, services, handlers, etc. +The provider then watches for incoming ingresses events, such as the example below, +and derives the corresponding dynamic configuration from it, +which in turn will create the resulting routers, services, handlers, etc. ```yaml tab="File (YAML)" kind: Ingress @@ -49,17 +51,26 @@ spec: ## LetsEncrypt Support with the Ingress Provider -By design, Traefik is a stateless application, meaning that it only derives its configuration from the environment it runs in, without additional configuration. -For this reason, users can run multiple instances of Traefik at the same time to achieve HA, as is a common pattern in the kubernetes ecosystem. +By design, Traefik is a stateless application, +meaning that it only derives its configuration from the environment it runs in, +without additional configuration. +For this reason, users can run multiple instances of Traefik at the same time to achieve HA, +as is a common pattern in the kubernetes ecosystem. -When using a single instance of Traefik with LetsEncrypt, no issues should be encountered, however this could be a single point of failure. -Unfortunately, it is not possible to run multiple instances of Traefik 2.0 with LetsEncrypt enabled, because there is no way to ensure that the correct instance of Traefik will receive the challenge request, and subsequent responses. -Previous versions of Traefik used a [KV store](https://docs.traefik.io/v1.7/configuration/acme/#storage) to attempt to achieve this, but due to sub-optimal performance was dropped as a feature in 2.0. +When using a single instance of Traefik with LetsEncrypt, no issues should be encountered, +however this could be a single point of failure. +Unfortunately, it is not possible to run multiple instances of Traefik 2.0 with LetsEncrypt enabled, +because there is no way to ensure that the correct instance of Traefik will receive the challenge request, and subsequent responses. +Previous versions of Traefik used a [KV store](https://docs.traefik.io/v1.7/configuration/acme/#storage) to attempt to achieve this, +but due to sub-optimal performance was dropped as a feature in 2.0. -If you require LetsEncrypt with HA in a kubernetes environment, we recommend using [TraefikEE](https://containo.us/traefikee/) where distributed LetsEncrypt is a supported feature. +If you require LetsEncrypt with HA in a kubernetes environment, +we recommend using [TraefikEE](https://containo.us/traefikee/) where distributed LetsEncrypt is a supported feature. -If you are wanting to continue to run Traefik Community Edition, LetsEncrypt HA can be achieved by using a Certificate Controller such as [Cert-Manager](https://docs.cert-manager.io/en/latest/index.html). -When using Cert-Manager to manage certificates, it will create secrets in your namespaces that can be referenced as TLS secrets in your [ingress objects](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls). +If you are wanting to continue to run Traefik Community Edition, +LetsEncrypt HA can be achieved by using a Certificate Controller such as [Cert-Manager](https://docs.cert-manager.io/en/latest/index.html). +When using Cert-Manager to manage certificates, +it will create secrets in your namespaces that can be referenced as TLS secrets in your [ingress objects](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls). ## Provider Configuration @@ -93,7 +104,8 @@ They are both provided automatically as mounts in the pod where Traefik is deplo When the environment variables are not found, Traefik tries to connect to the Kubernetes API server with an external-cluster client. In which case, the endpoint is required. -Specifically, it may be set to the URL used by `kubectl proxy` to connect to a Kubernetes cluster using the granted authentication and authorization of the associated kubeconfig. +Specifically, it may be set to the URL used by `kubectl proxy` to connect to a Kubernetes cluster using the granted authentication +and authorization of the associated kubeconfig. ### `token` @@ -339,4 +351,5 @@ providers: ## Further -If one wants to know more about the various aspects of the Ingress spec that Traefik supports, many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.0/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. +If one wants to know more about the various aspects of the Ingress spec that Traefik supports, +many examples of Ingresses definitions are located in the tests [data](https://github.com/containous/traefik/tree/v2.1/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository. diff --git a/docs/content/user-guides/crd-acme/03-deployments.yml b/docs/content/user-guides/crd-acme/03-deployments.yml index 4873b34c9..0f8912fc3 100644 --- a/docs/content/user-guides/crd-acme/03-deployments.yml +++ b/docs/content/user-guides/crd-acme/03-deployments.yml @@ -26,19 +26,19 @@ spec: serviceAccountName: traefik-ingress-controller containers: - name: traefik - image: traefik:v2.0 + image: traefik:v2.1 args: - --api.insecure - --accesslog - --entrypoints.web.Address=:8000 - --entrypoints.websecure.Address=:4443 - --providers.kubernetescrd - - --certificatesresolvers.default.acme.tlschallenge - - --certificatesresolvers.default.acme.email=foo@you.com - - --certificatesresolvers.default.acme.storage=acme.json + - --certificatesresolvers.myresolver.acme.tlschallenge + - --certificatesresolvers.myresolver.acme.email=foo@you.com + - --certificatesresolvers.myresolver.acme.storage=acme.json # Please note that this is the staging Let's Encrypt server. # Once you get things working, you should remove that whole line altogether. - - --certificatesresolvers.default.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory + - --certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory ports: - name: web containerPort: 8000 diff --git a/docs/content/user-guides/crd-acme/04-ingressroutes.yml b/docs/content/user-guides/crd-acme/04-ingressroutes.yml index 9c6376d62..d21497599 100644 --- a/docs/content/user-guides/crd-acme/04-ingressroutes.yml +++ b/docs/content/user-guides/crd-acme/04-ingressroutes.yml @@ -29,4 +29,4 @@ spec: - name: whoami port: 80 tls: - certResolver: default + certResolver: myresolver diff --git a/docs/content/user-guides/crd-acme/k3s.yml b/docs/content/user-guides/crd-acme/k3s.yml index a424d9f56..4a26bc109 100644 --- a/docs/content/user-guides/crd-acme/k3s.yml +++ b/docs/content/user-guides/crd-acme/k3s.yml @@ -26,5 +26,5 @@ node: - K3S_CLUSTER_SECRET=somethingtotallyrandom volumes: # this is where you would place a alternative traefik image (saved as a .tar file with - # 'docker save'), if you want to use it, instead of the traefik:v2.0 image. + # 'docker save'), if you want to use it, instead of the traefik:v2.1 image. - /sowewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images 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 14cf5c435..e601f1d05 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 @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.0.0-rc3" + image: "traefik:v2.1" container_name: "traefik" command: #- "--log.level=DEBUG" @@ -12,11 +12,11 @@ services: - "--providers.docker.exposedbydefault=false" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge=true" - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge.provider=ovh" - #- "--certificatesresolvers.mydnschallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - - "--certificatesresolvers.mydnschallenge.acme.email=postmaster@mydomain.com" - - "--certificatesresolvers.mydnschallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.dnschallenge=true" + - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ports: - "80:80" - "443:443" @@ -37,4 +37,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)" - "traefik.http.routers.whoami.entrypoints=websecure" - - "traefik.http.routers.whoami.tls.certresolver=mydnschallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" 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 03d00179d..358a71d60 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 @@ -13,7 +13,7 @@ secrets: services: traefik: - image: "traefik:v2.0.0-rc3" + image: "traefik:v2.1" container_name: "traefik" command: #- "--log.level=DEBUG" @@ -22,11 +22,11 @@ services: - "--providers.docker.exposedbydefault=false" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge=true" - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge.provider=ovh" - #- "--certificatesresolvers.mydnschallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - - "--certificatesresolvers.mydnschallenge.acme.email=postmaster@mydomain.com" - - "--certificatesresolvers.mydnschallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.dnschallenge=true" + - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ports: - "80:80" - "443:443" @@ -52,4 +52,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)" - "traefik.http.routers.whoami.entrypoints=websecure" - - "traefik.http.routers.whoami.tls.certresolver=mydnschallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" 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 b66706337..bab542c4e 100644 --- a/docs/content/user-guides/docker-compose/acme-dns/index.md +++ b/docs/content/user-guides/docker-compose/acme-dns/index.md @@ -7,7 +7,7 @@ Please also read the [basic example](../basic-example) for details on how to exp For the DNS challenge, you'll need: -- A working [provider](https://docs.traefik.io/v2.0/https/acme/#providers) along with the credentials allowing to create and remove DNS records. +- A working [provider](../../../https/acme.md#providers) along with the credentials allowing to create and remove DNS records. !!! info "Variables may vary depending on the Provider." Please note this guide may vary depending on the provider you use. @@ -32,13 +32,13 @@ For the DNS challenge, you'll need: - "OVH_CONSUMER_KEY=[YOUR_OWN_VALUE]" ``` -- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.mydnschallenge.acme.email` command line argument of the `traefik` service. +- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service. - Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service. - Optionally uncomment the following lines if you want to test/debug: ```yaml #- "--log.level=DEBUG" - #- "--certificatesresolvers.mydnschallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" ``` - Run `docker-compose up -d` within the folder where you created the previous file. @@ -68,12 +68,12 @@ ports: ```yaml command: - # Enable a dns challenge named "mydnschallenge" - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge=true" + # Enable a dns challenge named "myresolver" + - "--certificatesresolvers.myresolver.acme.dnschallenge=true" # Tell which provider to use - - "--certificatesresolvers.mydnschallenge.acme.dnschallenge.provider=ovh" + - "--certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh" # The email to provide to let's encrypt - - "--certificatesresolvers.mydnschallenge.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" ``` - We provide the required configuration to our provider via environment variables: @@ -101,14 +101,14 @@ volumes: command: # Tell to store the certificate on a path under our volume - - "--certificatesresolvers.mydnschallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ``` -- We configure the `whoami` service to tell Traefik to use the certificate resolver named `mydnschallenge` we just configured: +- We configure the `whoami` service to tell Traefik to use the certificate resolver named `myresolver` we just configured: ```yaml labels: - - "traefik.http.routers.whoami.tls.certresolver=mydnschallenge" # Uses the Host rule to define which certificate to issue + - "traefik.http.routers.whoami.tls.certresolver=myresolver" # Uses the Host rule to define which certificate to issue ``` ## Use Secrets 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 b63906d55..48124f0c7 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 @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.0.0-rc3" + image: "traefik:v2.1" container_name: "traefik" command: #- "--log.level=DEBUG" @@ -12,11 +12,11 @@ services: - "--providers.docker.exposedbydefault=false" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.myhttpchallenge.acme.httpchallenge=true" - - "--certificatesresolvers.myhttpchallenge.acme.httpchallenge.entrypoint=web" - #- "--certificatesresolvers.myhttpchallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - - "--certificatesresolvers.myhttpchallenge.acme.email=postmaster@mydomain.com" - - "--certificatesresolvers.myhttpchallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.httpchallenge=true" + - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ports: - "80:80" - "443:443" @@ -32,4 +32,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)" - "traefik.http.routers.whoami.entrypoints=websecure" - - "traefik.http.routers.whoami.tls.certresolver=myhttpchallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" 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 6b448c17a..ccd04c1dd 100644 --- a/docs/content/user-guides/docker-compose/acme-http/index.md +++ b/docs/content/user-guides/docker-compose/acme-http/index.md @@ -18,13 +18,13 @@ For the HTTP challenge you will need: --8<-- "content/user-guides/docker-compose/acme-http/docker-compose.yml" ``` -- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myhttpchallenge.acme.email` command line argument of the `traefik` service. +- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service. - Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service. - Optionally uncomment the following lines if you want to test/debug: ```yaml #- "--log.level=DEBUG" - #- "--certificatesresolvers.myhttpchallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" ``` - Run `docker-compose up -d` within the folder where you created the previous file. @@ -54,12 +54,12 @@ ports: ```yaml command: - # Enable a http challenge named "myhttpchallenge" - - "--certificatesresolvers.myhttpchallenge.acme.httpchallenge=true" + # Enable a http challenge named "myresolver" + - "--certificatesresolvers.myresolver.acme.httpchallenge=true" # Tell it to use our predefined entrypoint named "web" - - "--certificatesresolvers.myhttpchallenge.acme.httpchallenge.entrypoint=web" + - "--certificatesresolvers.myresolver.acme.httpchallenge.entrypoint=web" # The email to provide to let's encrypt - - "--certificatesresolvers.myhttpchallenge.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" ``` - We add a volume to store our certificates: @@ -71,13 +71,13 @@ volumes: command: # Tell to store the certificate on a path under our volume - - "--certificatesresolvers.myhttpchallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ``` -- We configure the `whoami` service to tell Traefik to use the certificate resolver named `myhttpchallenge` we just configured: +- We configure the `whoami` service to tell Traefik to use the certificate resolver named `myresolver` we just configured: ```yaml labels: # Uses the Host rule to define which certificate to issue - - "traefik.http.routers.whoami.tls.certresolver=myhttpchallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" ``` \ No newline at end of file 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 fe1ae9f1f..c23ef1f9b 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 @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.0.0-rc3" + image: "traefik:v2.1" container_name: "traefik" command: #- "--log.level=DEBUG" @@ -11,10 +11,10 @@ services: - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - "--entrypoints.websecure.address=:443" - - "--certificatesresolvers.mytlschallenge.acme.tlschallenge=true" - #- "--certificatesresolvers.mytlschallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - - "--certificatesresolvers.mytlschallenge.acme.email=postmaster@mydomain.com" - - "--certificatesresolvers.mytlschallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.tlschallenge=true" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + - "--certificatesresolvers.myresolver.acme.email=postmaster@mydomain.com" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ports: - "443:443" - "8080:8080" @@ -29,4 +29,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.whoami.rule=Host(`whoami.mydomain.com`)" - "traefik.http.routers.whoami.entrypoints=websecure" - - "traefik.http.routers.whoami.tls.certresolver=mytlschallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" 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 40fe8f904..ced00e876 100644 --- a/docs/content/user-guides/docker-compose/acme-tls/index.md +++ b/docs/content/user-guides/docker-compose/acme-tls/index.md @@ -18,13 +18,13 @@ For the TLS challenge you will need: --8<-- "content/user-guides/docker-compose/acme-tls/docker-compose.yml" ``` -- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.mytlschallenge.acme.email` command line argument of the `traefik` service. +- Replace `postmaster@mydomain.com` by your **own email** within the `certificatesresolvers.myresolver.acme.email` command line argument of the `traefik` service. - Replace `whoami.mydomain.com` by your **own domain** within the `traefik.http.routers.whoami.rule` label of the `whoami` service. - Optionally uncomment the following lines if you want to test/debug: ```yaml #- "--log.level=DEBUG" - #- "--certificatesresolvers.mytlschallenge.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" + #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" ``` - Run `docker-compose up -d` within the folder where you created the previous file. @@ -54,8 +54,8 @@ ports: ```yaml command: - # Enable a tls challenge named "mytlschallenge" - - "--certificatesresolvers.mytlschallenge.acme.tlschallenge=true" + # Enable a tls challenge named "myresolver" + - "--certificatesresolvers.myresolver.acme.tlschallenge=true" ``` - We add a volume to store our certificates: @@ -67,13 +67,13 @@ volumes: command: # Tell to store the certificate on a path under our volume - - "--certificatesresolvers.mytlschallenge.acme.storage=/letsencrypt/acme.json" + - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" ``` -- We configure the `whoami` service to tell Traefik to use the certificate resolver named `mytlschallenge` we just configured: +- We configure the `whoami` service to tell Traefik to use the certificate resolver named `myresolver` we just configured: ```yaml labels: # Uses the Host rule to define which certificate to issue - - "traefik.http.routers.whoami.tls.certresolver=mytlschallenge" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" ``` 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 327ab5b67..4d99992d2 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 @@ -3,7 +3,7 @@ version: "3.3" services: traefik: - image: "traefik:v2.0.0-rc3" + image: "traefik:v2.1" container_name: "traefik" command: #- "--log.level=DEBUG"