From 11b87685c3569dcb6d3e8abf052b3b1c97368848 Mon Sep 17 00:00:00 2001
From: Moritz 'e1mo' Fromm <git@e1mo.de>
Date: Sat, 22 Jul 2023 22:19:28 +0200
Subject: [PATCH] Apply suggestions from code review

---
 services/matrix/default.nix             | 29 +++++++++++++++----------
 services/matrix/synapse-log_config.yaml |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/services/matrix/default.nix b/services/matrix/default.nix
index af4ed76..46d20fb 100644
--- a/services/matrix/default.nix
+++ b/services/matrix/default.nix
@@ -23,7 +23,13 @@ in {
       root = pkgs.element-web.override {
         # Somewhat duplicate of the stuff in website.nix but I am
         # not sure if we absolutely need to dedup this, just out of complexity perspective
-        conf.default_server_config."m.homeserver".base_url = "https://matrix.${baseDomain}/";
+        conf = {
+          default_server_config."m.homeserver" = {
+            base_url = "https://matrix.${baseDomain}/";
+            server_name = baseDomain;
+          };
+          default_country_code = "DE";
+        };
       };
     };
     "matrix.${baseDomain}"  = {
@@ -97,7 +103,6 @@ in {
         "fc00::/7"
       ];
       
-      additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
       admin_contact = "mailto:administration@chaos.jetzt";
       url_preview_enabled = true;
       media_store_path = "/mnt/synapse_media_store";
@@ -136,16 +141,16 @@ in {
       # For our saml sso stuff we need to have additional_ressouces, but they are not possible with the NixOS module listener
       (format "additional_ressources.yaml" {
         listeners = [{
-        bind_addresses = [ "::1" "127.0.0.1" ];
-        port = matrixPort;
-        type = "http";
-        tls = false;
-        x_forwarded = true;
-        resources = [{
-          names = [ "client" "federation" ];
-          compress = false;
-        }];
-        additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
+          bind_addresses = [ "::1" "127.0.0.1" ];
+          port = matrixPort;
+          type = "http";
+          tls = false;
+          x_forwarded = true;
+          resources = [{
+            names = [ "client" "federation" ];
+            compress = false;
+          }];
+          additional_resources."/_matrix/saml2/pick_username".module = "matrix_synapse_saml_mapper.pick_username_resource";
         }];
       })
     ];
diff --git a/services/matrix/synapse-log_config.yaml b/services/matrix/synapse-log_config.yaml
index 91707db..f72b7cf 100644
--- a/services/matrix/synapse-log_config.yaml
+++ b/services/matrix/synapse-log_config.yaml
@@ -1,5 +1,5 @@
 # Based on https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/services/matrix/synapse-log_config.yaml
-# Just with a log-level of notice
+# Just with a log-level of warning
 version: 1
 
 # In systemd's journal, loglevel is implicitly stored, so let's omit it