From ed116526075c3ee3202fd4e3ba8a03e892c3d0ea Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sun, 6 Mar 2022 01:43:19 +0100
Subject: [PATCH] Fix matrix public_baseurl being wrong

Still forward traffic on vanpetegem.me for now, since clients don't seem to
update automatically (immediately?).
---
 machines/lasting-integrity/default.nix | 15 ++++++++++++++-
 modules/services/matrix/default.nix    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix
index 375591c3..7d8b7d4e 100644
--- a/machines/lasting-integrity/default.nix
+++ b/machines/lasting-integrity/default.nix
@@ -69,7 +69,20 @@
             }; in
               {
                 "/_matrix" = matrixRedirect;
-                "/.well-known/matrix" = matrixRedirect;
+                "/.well-known/matrix" = {
+                  root = pkgs.runCommandNoCC "well-known-matrix" { } ''
+                    mkdir -p $out/.well-known/matrix
+                    echo '{"m.server":"matrix.vanpetegem.me:443"}' > $out/.well-known/matrix/server
+                    echo '{"m.homeserver":{"base_url":"https://matrix.vanpetegem.me"}}' > $out/.well-known/matrix/client
+                  '';
+                  extraConfig = ''
+                    default_type application/json;
+                    add_header 'access-control-allow-origin' '*' always;
+                    add_header 'access-control-allow-methods' 'GET, HEAD, POST, PUT, DELETE, OPTIONS' always;
+                    add_header 'access-control-allow-headers' 'X-Requested-With, Content-Type, Authorization, Date' always;
+                 '';
+                  priority = 1;
+                };
                 "/".return = "307 https://www.vanpetegem.me$request_uri";
               };
           };
diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix
index 05812bca..115265af 100644
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@@ -31,7 +31,7 @@
       matrix-synapse = {
         enable = true;
         server_name = "vanpetegem.me";
-        public_baseurl = "https://vanpetegem.me";
+        public_baseurl = "https://matrix.vanpetegem.me";
         listeners = [{
           port = 8448;
           bind_address = "localhost";