diff --git a/docs/content/https-tls/overview.md b/docs/content/https-tls/overview.md index 6a2a48e2c..3b1a20733 100644 --- a/docs/content/https-tls/overview.md +++ b/docs/content/https-tls/overview.md @@ -19,7 +19,7 @@ TLS is enabled at the [router](../routing/routers/index.md) level, but some opti ```toml [tlsOptions] - [tlsOptions.default] + [tlsOptions.default] minVersion = "VersionTLS12" ``` diff --git a/docs/content/middlewares/digestauth.md b/docs/content/middlewares/digestauth.md index e5c3a97fa..e57f49cb9 100644 --- a/docs/content/middlewares/digestauth.md +++ b/docs/content/middlewares/digestauth.md @@ -14,7 +14,8 @@ The DigestAuth middleware is a quick way to restrict access to your services to ```toml [http.middlewares] [http.middlewares.test-auth.digestauth] - users = ["test:traefik:a2688e031edb4be6a3797f3882655c05", "test2:traefik:518845800f9e2bfb1f1f740ec24f074e"] + users = ["test:traefik:a2688e031edb4be6a3797f3882655c05", + "test2:traefik:518845800f9e2bfb1f1f740ec24f074e"] ``` ??? example "Docker -- Using an external file for the authorized users" diff --git a/docs/content/middlewares/overview.md b/docs/content/middlewares/overview.md index 21bc5015f..90cd6febe 100644 --- a/docs/content/middlewares/overview.md +++ b/docs/content/middlewares/overview.md @@ -23,7 +23,7 @@ Pieces of middleware can be combined in chains to fit every scenario. [http.routers.router1] Service = "myService" Middlewares = ["foo-add-prefix"] - Rule = "Host: example.com" + Rule = "Host(`example.com`)" [http.middlewares] [http.middlewares.foo-add-prefix.AddPrefix] diff --git a/docs/content/operations/dashboard.md b/docs/content/operations/dashboard.md index 7a21fca66..c8c4c02dc 100644 --- a/docs/content/operations/dashboard.md +++ b/docs/content/operations/dashboard.md @@ -5,9 +5,9 @@ See What's Going On The dashboard is the central place that shows you the current active routes handled by Traefik. -??? note "Dashboard WIP" - Currently, the dashboard is in a Work In Progress State while being reconstructed for v2. - Therefore, the dashboard is currently not working. +!!! warning "Dashboard WIP" + Currently, the dashboard is in a Work In Progress State while being reconstructed for v2. + Therefore, the dashboard is currently not working.
Dashboard - Providers diff --git a/docs/content/operations/ping.md b/docs/content/operations/ping.md index 6c64a88c7..5313382a6 100644 --- a/docs/content/operations/ping.md +++ b/docs/content/operations/ping.md @@ -5,35 +5,15 @@ Checking the Health of Your Traefik Instances ## Configuration Examples -??? example "Enabling /ping on the http EntryPoint" +??? example "Enabling /ping" ```toml - [entrypoints] - [entrypoints.web] - address = ":80" - [ping] - entryPoint = "http" - ``` - -??? example "Enabling /ping on the https EntryPoint" - - ```toml - [entrypoints] - [entrypoints.web] - address = ":80" - - [entrypoints.web-secure] - address = ":443" - [entrypoints.web-secure.tls] - - [ping] - entryPoint = "https" ``` ??? example "Enabling /ping on a dedicated EntryPoint" - ```toml + ```toml [entrypoints] [entrypoints.web] address = ":80" @@ -45,8 +25,8 @@ Checking the Health of Your Traefik Instances entryPoint = "ping" ``` -| Path | Method | Description | -|---------|---------------|----------------------------------------------------------------------------------------------------| +| Path | Method | Description | +|---------|---------------|-----------------------------------------------------------------------------------------------------| | `/ping` | `GET`, `HEAD` | A simple endpoint to check for Traefik process liveness. Return a code `200` with the content: `OK` | ## Configuration Options diff --git a/docs/content/providers/docker.md b/docs/content/providers/docker.md index 3af842665..2ff3ccc42 100644 --- a/docs/content/providers/docker.md +++ b/docs/content/providers/docker.md @@ -17,7 +17,7 @@ Attach labels to your containers and let Traefik do the rest! Enabling the docker provider ```toml - [docker] + [providers.docker] endpoint = "unix:///var/run/docker.sock" ``` diff --git a/docs/content/routing/entrypoints.md b/docs/content/routing/entrypoints.md index 3da6597a4..ce4fecfca 100644 --- a/docs/content/routing/entrypoints.md +++ b/docs/content/routing/entrypoints.md @@ -29,11 +29,6 @@ They define the port which will receive the requests (whether HTTP or TCP). [entrypoints.web-secure] address = ":443" - - [entrypoints.web-secure.tls] - [[entrypoints.web-secure.tls.certificates]] - certFile = "tests/traefik.crt" - keyFile = "tests/traefik.key" ``` - Two entrypoints are defined: one called `web`, and the other called `web-secure`. @@ -51,7 +46,7 @@ Entrypoints are part of the [static configuration](../getting-started/configurat ```shell --entryPoints='Name:http Address::80' - --entryPoints='Name:https Address::443 TLS' + --entryPoints='Name:https Address::443' ``` !!! note diff --git a/docs/content/routing/routers/index.md b/docs/content/routing/routers/index.md index a5fde96b4..9cdd60c0f 100644 --- a/docs/content/routing/routers/index.md +++ b/docs/content/routing/routers/index.md @@ -15,7 +15,7 @@ In the process, routers may use pieces of [middleware](../../middlewares/overvie ```toml [http.routers] [http.routers.my-router] - rule = "Path(/foo)" + rule = "Path(`/foo`)" service = "service-foo" ``` @@ -24,7 +24,7 @@ In the process, routers may use pieces of [middleware](../../middlewares/overvie ```toml [http.routers] [http.routers.my-router] - rule = "Path(/foo)" + rule = "Path(`/foo`)" middlewares = ["authentication"] # declared elsewhere service = "service-foo" ``` @@ -67,7 +67,7 @@ If you want to limit the router scope to a set of entrypoint, set the entrypoint [http.routers] [http.routers.Router-1] # By default, routers listen to every entrypoints - rule = "Host(traefik.io)" + rule = "Host(`traefik.io`)" service = "service-1" ``` @@ -85,7 +85,7 @@ If you want to limit the router scope to a set of entrypoint, set the entrypoint [http.routers] [http.routers.Router-1] entryPoints = ["web-secure", "other"] # won't listen to entrypoint web - rule = "Host(traefik.io)" + rule = "Host(`traefik.io`)" service = "service-1" ``` @@ -248,9 +248,9 @@ If you want to limit the router scope to a set of entrypoints, set the entrypoin ### Rule -| Rule | Description | -|--------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------| -| ``HostSNI(`domain-1`, ...)`` | Check if the Server Name Indication corresponds to the given `domains`. | +| Rule | Description | +|------------------------------|-------------------------------------------------------------------------| +| ``HostSNI(`domain-1`, ...)`` | Check if the Server Name Indication corresponds to the given `domains`. | !!! important "HostSNI & TLS" diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md index c4af3a8c8..cb4aca7dd 100644 --- a/docs/content/routing/services/index.md +++ b/docs/content/routing/services/index.md @@ -80,6 +80,7 @@ The `weight` option defines the weight of the server for the load balancing algo [http.services.my-service.LoadBalancer] [[http.services.my-service.LoadBalancer.servers]] url = "http://private-ip-server-1/" + weight = 1 ``` #### Load-balancing @@ -97,8 +98,10 @@ Various methods of load balancing are supported: method = "drr" [[http.services.my-service.LoadBalancer.servers]] url = "http://private-ip-server-1/" + weight = 1 [[http.services.my-service.LoadBalancer.servers]] url = "http://private-ip-server-1/" + weight = 1 ``` #### Sticky sessions