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

2020-03-18 18:12:24 +01:00
parent 44221fba49 683d5d5a48
commit 2b28607a4e
10 changed files with 41 additions and 10 deletions
--- a/docs/content/reference/static-configuration/file.toml
+++ b/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"