Merge branch v2.2 into v2.3

2020-09-04 21:06:11 +02:00
parent 235d1d655d 2d1a973ee5
commit 3678bd5a93
44 changed files with 1292 additions and 1357 deletions
--- a/docs/content/reference/static-configuration/file.yaml
+++ b/docs/content/reference/static-configuration/file.yaml
@@ -352,6 +352,7 @@ certificatesResolvers:
    acme:
      email: foobar
      caServer: foobar
+      preferredChain: foobar
      storage: foobar
      keyType: foobar
      dnsChallenge:
@@ -368,6 +369,7 @@ certificatesResolvers:
    acme:
      email: foobar
      caServer: foobar
+      preferredChain: foobar
      storage: foobar
      keyType: foobar
      dnsChallenge: