Merge remote-tracking branch 'upstream/v2.1' into v2.2

docs/content/reference/static-configuration/cli-ref.md

@@ -105,6 +105,12 @@ HTTP configuration.
 `--entrypoints.<name>.http.middlewares`:  
 Default middlewares for the routers linked to the entry point.
 
+`--entrypoints.<name>.http.redirections.entrypoint.permanent`:  
+Applied a permanent redirection. Defaults to true. (Default: ```true```)
+
+`--entrypoints.<name>.http.redirections.entrypoint.priority`:  
+Priority of the generated router. Defaults to 1. (Default: ```1```)
+
 `--entrypoints.<name>.http.redirections.entrypoint.scheme`:  
 Scheme used for the redirection. Defaults to https. (Default: ```https```)
 

docs/content/reference/static-configuration/env-ref.md

@@ -105,6 +105,12 @@ HTTP configuration.
 `TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_MIDDLEWARES`:  
 Default middlewares for the routers linked to the entry point.
 
+`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_PERMANENT`:  
+Applied a permanent redirection. Defaults to true. (Default: ```true```)
+
+`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_PRIORITY`:  
+Priority of the generated router. Defaults to 1. (Default: ```1```)
+
 `TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_REDIRECTIONS_ENTRYPOINT_SCHEME`:  
 Scheme used for the redirection. Defaults to https. (Default: ```https```)
 

docs/content/reference/static-configuration/file.toml

@@ -34,6 +34,8 @@
         [entryPoints.EntryPoint0.http.redirections.entryPoint]
           to = "foobar"
           scheme = "foobar"
+          permanent = true
+          priority = 42
       [entryPoints.EntryPoint0.http.tls]
         options = "foobar"
         certResolver = "foobar"

docs/content/reference/static-configuration/file.yaml

@@ -37,6 +37,8 @@ entryPoints:
         entryPoint:
           to: foobar
           scheme: foobar
+          permanent: true
+          priority: 42
       middlewares:
       - foobar
       - foobar