summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/7463.doc1
-rw-r--r--docs/reverse_proxy.md12
2 files changed, 12 insertions, 1 deletions
diff --git a/changelog.d/7463.doc b/changelog.d/7463.doc
new file mode 100644
index 0000000000..85e6354303
--- /dev/null
+++ b/changelog.d/7463.doc
@@ -0,0 +1 @@
+Add additional reverse proxy example for Caddy v2. Contributed by Jeff Peeler.
diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md
index 7c300023c6..82bd5d1cdf 100644
--- a/docs/reverse_proxy.md
+++ b/docs/reverse_proxy.md
@@ -62,7 +62,7 @@ the reverse proxy and the homeserver.
 > **NOTE**: Do not add a `/` after the port in `proxy_pass`, otherwise nginx will
 canonicalise/normalise the URI.
 
-### Caddy
+### Caddy 1
 
         matrix.example.com {
           proxy /_matrix http://localhost:8008 {
@@ -76,6 +76,16 @@ canonicalise/normalise the URI.
           }
         }
 
+### Caddy 2
+
+        matrix.example.com {
+          reverse_proxy /_matrix/* http://localhost:8008
+        }
+
+        example.com:8448 {
+          reverse_proxy http://localhost:8008
+        }
+
 ### Apache
 
         <VirtualHost *:443>