Merge branch 'rmsthebest-next-patch-62586' into 'next'

Added Caddy to the web proxy examples

See merge request famedly/conduit!352

DEPLOY.md

@@ -163,7 +163,7 @@ sudo chmod 700 /var/lib/matrix-conduit/
 
 ## Setting up the Reverse Proxy
 
-This depends on whether you use Apache, Nginx or another web server.
+This depends on whether you use Apache, Caddy, Nginx or another web server.
 
 ### Apache
 
@@ -189,6 +189,19 @@ ProxyPassReverse /_matrix/ http://127.0.0.1:6167/_matrix/
 $ sudo systemctl reload apache2
 ```
 
+### Caddy
+Create `/etc/caddy/conf.d/conduit_caddyfile` and enter this (substitute for your server name).
+```caddy
+your.server.name, your.server.name:8448 {
+        reverse_proxy /_matrix/* 127.0.0.1:6167
+}
+```
+That's it! Just start or enable the service and you're set.
+```bash
+$ sudo systemctl enable caddy
+```
+
+
 ### Nginx
 
 If you use Nginx and not Apache, add the following server section inside the http section of `/etc/nginx/nginx.conf`
@@ -223,6 +236,8 @@ $ sudo systemctl reload nginx
 
 ## SSL Certificate
 
+If you chose Caddy as your web proxy SSL certificates are handled automatically and you can skip this step.
+
 The easiest way to get an SSL certificate, if you don't have one already, is to install `certbot` and run this:
 
 ```bash