From eba48c0f16d08d5806da73d0b51d62de6aaee118 Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 19:58:28 +0000
Subject: [PATCH 1/7] Add Caddy example to README

---
 README.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.rst b/README.rst
index e1ea351f84..de133f674d 100644
--- a/README.rst
+++ b/README.rst
@@ -652,6 +652,7 @@ 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
+`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,6 +683,11 @@ so an example nginx configuration might look like::
       }
   }
 
+an example caddy configuration may look like::
+    proxy /_matrix http://localhost:8008 {
+      transparent
+    }
+
 and an example apache configuration may look like::
 
     <VirtualHost *:443>

From b85fe45f46abd7ff1c42851ab6dbb2f4ff33758f Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 21:55:38 +0000
Subject: [PATCH 2/7] Add CL

---
 changelog.d/4072.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/4072.misc

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.

From 08760b0d9ac7d1ecf48b6aaef662cf346da7368d Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 21:57:28 +0000
Subject: [PATCH 3/7] Fix formatting.

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index de133f674d..bb99f4fe2b 100644
--- a/README.rst
+++ b/README.rst
@@ -684,6 +684,7 @@ so an example nginx configuration might look like::
   }
 
 an example caddy configuration may look like::
+
     proxy /_matrix http://localhost:8008 {
       transparent
     }

From 9c2f99a3b74ebd84c14314344bf7ff785b8ff1d1 Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 21:59:14 +0000
Subject: [PATCH 4/7] Fix

---
 README.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index bb99f4fe2b..b42a96a34c 100644
--- a/README.rst
+++ b/README.rst
@@ -684,9 +684,10 @@ so an example nginx configuration might look like::
   }
 
 an example caddy configuration may look like::
-
-    proxy /_matrix http://localhost:8008 {
-      transparent
+    example.com {
+      proxy /_matrix http://localhost:8008 {
+        transparent
+      }
     }
 
 and an example apache configuration may look like::

From 3f357583ce17e0816acbc373bc2179293212ba4e Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 21:59:39 +0000
Subject: [PATCH 5/7] I HATE RST

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index b42a96a34c..df9430f4cc 100644
--- a/README.rst
+++ b/README.rst
@@ -684,6 +684,7 @@ so an example nginx configuration might look like::
   }
 
 an example caddy configuration may look like::
+
     example.com {
       proxy /_matrix http://localhost:8008 {
         transparent

From 5c3d6ea9c72125ad152823e73f52667e845e6a61 Mon Sep 17 00:00:00 2001
From: steamport <steamport@protonmail.com>
Date: Fri, 19 Oct 2018 22:00:27 +0000
Subject: [PATCH 6/7] Whoops!

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index df9430f4cc..209313ba37 100644
--- a/README.rst
+++ b/README.rst
@@ -685,7 +685,7 @@ so an example nginx configuration might look like::
 
 an example caddy configuration may look like::
 
-    example.com {
+    matrix.example.com {
       proxy /_matrix http://localhost:8008 {
         transparent
       }

From 6340141300ea9370651b9dbcc2574fff96f45d48 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 22 Oct 2018 16:17:27 +0100
Subject: [PATCH 7/7] README.rst: fix minor grammar

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 209313ba37..9f27c14c4a 100644
--- a/README.rst
+++ b/README.rst
@@ -651,7 +651,7 @@ 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
@@ -683,7 +683,7 @@ so an example nginx configuration might look like::
       }
   }
 
-an example caddy configuration may look like::
+an example Caddy configuration might look like::
 
     matrix.example.com {
       proxy /_matrix http://localhost:8008 {
@@ -691,7 +691,7 @@ an example caddy configuration may look like::
       }
     }
 
-and an example apache configuration may look like::
+and an example Apache configuration might look like::
 
     <VirtualHost *:443>
         SSLEngine on