summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@gmail.com>2020-05-15 09:36:01 -0400
committerGitHub <noreply@github.com>2020-05-15 14:36:01 +0100
commit572b444dabc0f35f5d6fe6ebb0cfeb079a8fbf1f (patch)
tree38f5579dbfa4bf30abe8d4e9e3f2595dd23df1d7
parentUpdate the room member handler to use async/await. (#7507) (diff)
downloadsynapse-572b444dabc0f35f5d6fe6ebb0cfeb079a8fbf1f.tar.xz
Add Caddy 2 example (#7463)
The specific headers that are passed using this new configuration format
are Host and X-Forwarded-For, which should be all that's required.

Note that for production another matcher should be added in the first
section to properly handle the base_url lookup:
reverse_proxy /.well-known/matrix/* http://localhost:8008

Signed-off-by: Jeff Peeler <jpeeler@gmail.com>
-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>