From 288e89502a1f66ff8df632f433ed8eca77731dc6 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine97.martin@gmail.com>
Date: Tue, 2 Feb 2021 02:09:49 +0100
Subject: [PATCH] matrix: proxy calls to /_synapse/client correctly

---
 services/matrix.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/services/matrix.nix b/services/matrix.nix
index f36d701..f508325 100644
--- a/services/matrix.nix
+++ b/services/matrix.nix
@@ -81,13 +81,20 @@ in {
           forceSSL = true;
           enableACME = true;
 
-          # Or do a redirect instead of the 404, or whatever is appropriate for you.
-          # But do not put a Matrix Web client here! See the Element web section below.
-          locations."/".return = "404";
+          locations =
+            let
+              proxyToClientPort = {
+                proxyPass = "http://[::1]:${toString clientPort.private}";
+              };
+            in {
+              # Or do a redirect instead of the 404, or whatever is appropriate
+              # for you. But do not put a Matrix Web client here! See the
+              # Element web section below.
+              "/".return = "404";
 
-          locations."/_matrix" = {
-            proxyPass = "http://[::1]:${toString clientPort.private}";
-          };
+              "/_matrix" = proxyToClientPort;
+              "/_synapse/client" = proxyToClientPort;
+            };
 
           listen = [
             { addr = "0.0.0.0"; port = clientPort.public; ssl = true; }