summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--README.rst13
-rw-r--r--changelog.d/4072.misc1
2 files changed, 12 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index e1ea351f84..9f27c14c4a 100644
--- a/README.rst
+++ b/README.rst
@@ -651,7 +651,8 @@ Using a reverse proxy with Synapse
 
 It is recommended to put a reverse proxy such as
 `nginx <https://nginx.org/en/docs/http/ngx_http_proxy_module.html>`_,
-`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_ or
+`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_,
+`Caddy <https://caddyserver.com/docs/proxy>`_ or
 `HAProxy <https://www.haproxy.org/>`_ in front of Synapse. One advantage of
 doing so is that it means that you can expose the default https port (443) to
 Matrix clients without needing to run Synapse with root privileges.
@@ -682,7 +683,15 @@ so an example nginx configuration might look like::
       }
   }
 
-and an example apache configuration may look like::
+an example Caddy configuration might look like::
+
+    matrix.example.com {
+      proxy /_matrix http://localhost:8008 {
+        transparent
+      }
+    }
+
+and an example Apache configuration might look like::
 
     <VirtualHost *:443>
         SSLEngine on
diff --git a/changelog.d/4072.misc b/changelog.d/4072.misc
new file mode 100644
index 0000000000..9d7279fd2b
--- /dev/null
+++ b/changelog.d/4072.misc
@@ -0,0 +1 @@
+The README now contains example for the Caddy web server. Contributed by steamp0rt.