From a3d7bf40101a67cd8197ae327ec2cf1ae7fa50cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolai=20S=C3=B8borg?= Date: Sun, 5 Jul 2020 22:29:37 +0200 Subject: [PATCH 1/2] Change Caddy links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current links points to Caddy v1 which is deprecated. Signed-off-by: Nicolai Søborg --- README.rst | 2 +- docs/reverse_proxy.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 2441b6a35cef..38376e23c2b3 100644 --- a/README.rst +++ b/README.rst @@ -215,7 +215,7 @@ Using a reverse proxy with Synapse It is recommended to put a reverse proxy such as `nginx `_, `Apache `_, -`Caddy `_ or +`Caddy `_ or `HAProxy `_ 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. diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md index cbb8269568b3..131990001ae9 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md @@ -3,7 +3,7 @@ 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), -[Caddy](https://caddyserver.com/docs/proxy) or +[Caddy](https://caddyserver.com/docs/quick-starts/reverse-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 From fb74f06f7a582afc96907f6d03b873ee013ddea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolai=20S=C3=B8borg?= Date: Tue, 7 Jul 2020 21:02:10 +0000 Subject: [PATCH 2/2] Add changelog entry --- changelog.d/7789.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7789.doc diff --git a/changelog.d/7789.doc b/changelog.d/7789.doc new file mode 100644 index 000000000000..254411c769cb --- /dev/null +++ b/changelog.d/7789.doc @@ -0,0 +1 @@ +Update doc links for caddy. Contributed by Nicolai Søborg.