From 54089daa0cca73fefdfc2694e0b3b4561add335b Mon Sep 17 00:00:00 2001 From: Matt Holt Date: Wed, 20 Jul 2022 11:36:49 -0600 Subject: [PATCH 1/3] Update reverse_proxy.md Improve/simplify Caddy examples. Remove Caddy v1 (has long been EOL'ed) --- docs/reverse_proxy.md | 53 +++++++++---------------------------------- 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md index 69caa8a73ee8..d1618e815526 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md @@ -79,63 +79,32 @@ server { } ``` -### Caddy v1 - -``` -matrix.example.com { - proxy /_matrix http://localhost:8008 { - transparent - } - - proxy /_synapse/client http://localhost:8008 { - transparent - } -} - -example.com:8448 { - proxy / http://localhost:8008 { - transparent - } -} -``` - ### Caddy v2 ``` matrix.example.com { - reverse_proxy /_matrix/* http://localhost:8008 - reverse_proxy /_synapse/client/* http://localhost:8008 + reverse_proxy /_matrix/* localhost:8008 + reverse_proxy /_synapse/client/* localhost:8008 } example.com:8448 { - reverse_proxy http://localhost:8008 + reverse_proxy localhost:8008 } ``` + [Delegation](delegate.md) example: -``` -(matrix-well-known-header) { - # Headers - header Access-Control-Allow-Origin "*" - header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" - header Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization" - header Content-Type "application/json" -} +``` example.com { - handle /.well-known/matrix/server { - import matrix-well-known-header - respond `{"m.server":"matrix.example.com:443"}` - } - - handle /.well-known/matrix/client { - import matrix-well-known-header - respond `{"m.homeserver":{"base_url":"https://matrix.example.com"},"m.identity_server":{"base_url":"https://identity.example.com"}}` - } + header /.well-known/matrix/* Content-Type application/json + header /.well-known/matrix/* Access-Control-Allow-Origin * + respond /.well-known/matrix/server `{"m.server": "matrix.example.com:443"}` + respond /.well-known/matrix/client `{"m.homeserver":{"base_url":"https://matrix.example.com"},"m.identity_server":{"base_url":"https://identity.example.com"}}` } matrix.example.com { - reverse_proxy /_matrix/* http://localhost:8008 - reverse_proxy /_synapse/client/* http://localhost:8008 + reverse_proxy /_matrix/* localhost:8008 + reverse_proxy /_synapse/client/* localhost:8008 } ``` From e6efd928909c03db8e03ecaf066412e097633ed1 Mon Sep 17 00:00:00 2001 From: Matt Holt Date: Thu, 21 Jul 2022 11:18:12 -0600 Subject: [PATCH 2/3] Create 13344.doc Signed-off-by: Matthew Holt --- changelog.d/13344.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13344.doc diff --git a/changelog.d/13344.doc b/changelog.d/13344.doc new file mode 100644 index 000000000000..733e052daaad --- /dev/null +++ b/changelog.d/13344.doc @@ -0,0 +1 @@ +Improve Caddy reverse proxy documentation From fd8d1878c8176a9c1a1050203a21d8f122f12304 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 25 Jul 2022 16:31:41 +0100 Subject: [PATCH 3/3] Update changelog.d/13344.doc --- changelog.d/13344.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/13344.doc b/changelog.d/13344.doc index 733e052daaad..fca187df9210 100644 --- a/changelog.d/13344.doc +++ b/changelog.d/13344.doc @@ -1 +1 @@ -Improve Caddy reverse proxy documentation +Improve Caddy reverse proxy documentation.