From e067db613c0e849da5a6e0a163114e3bc6c05785 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 9 May 2019 13:20:26 +0100 Subject: [PATCH 1/2] Fix exception to proxying --- examples/caddy/matrix-synapse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/caddy/matrix-synapse b/examples/caddy/matrix-synapse index 8cb9805a2..69e140d88 100644 --- a/examples/caddy/matrix-synapse +++ b/examples/caddy/matrix-synapse @@ -22,7 +22,7 @@ https://matrix.DOMAIN { # Synapse Client<>Server API proxy / matrix-synapse:8008 { transparent - without /.well-known/ /_matrix/identity/ /_matrix/client/r0/user_directory/search + except /.well-known/ /_matrix/identity/ /_matrix/client/r0/user_directory/search } } From cdac997ddb073411fa5ed8dd67299bc9a4be49ec Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 9 May 2019 13:22:23 +0100 Subject: [PATCH 2/2] Improve comments for Caddy's TLS instructions --- examples/caddy/matrix-dimension | 2 ++ examples/caddy/matrix-synapse | 1 + 2 files changed, 3 insertions(+) diff --git a/examples/caddy/matrix-dimension b/examples/caddy/matrix-dimension index 6defb0d25..82f12c01a 100644 --- a/examples/caddy/matrix-dimension +++ b/examples/caddy/matrix-dimension @@ -1,4 +1,6 @@ https://dimension.DOMAIN { + # These might differ if you are supplying your own certificates + # If you wish to use Caddy's built-in Let's Encrypt support, you can also supply an email address here tls /matrix/ssl/config/live/dimension.DOMAIN/fullchain.pem /matrix/ssl/config/live/dimension.DOMAIN/privkey.pem proxy / http://127.0.0.1:8134/ { diff --git a/examples/caddy/matrix-synapse b/examples/caddy/matrix-synapse index 69e140d88..30f7c5a23 100644 --- a/examples/caddy/matrix-synapse +++ b/examples/caddy/matrix-synapse @@ -1,5 +1,6 @@ https://matrix.DOMAIN { # If you use your own certificates, your path may differ + # If you wish to use Caddy's built-in Let's Encrypt support, you can also supply an email address here tls /matrix/ssl/config/live/matrix.DOMAIN/fullchain.pem /matrix/ssl/config/live/matrix.DOMAIN/privkey.pem root /matrix/static-files