Merge pull request 'matrix: Enable MSC4108 to allow signing in with QR Code' (#274) from matrix-rendezvous-server-attempt-2 into main

Reviewed-on: #274
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>

modules/matrix/default.nix

@@ -124,6 +124,17 @@ in
         enable_room_list_search = true;
         encryption_enabled_by_default_for_room_type = "off";
         event_cache_size = "100K";
+
+        # https://github.com/element-hq/synapse/issues/11203
+        # No YAML deep-merge, so this needs to be in secret extraConfigFiles
+        # together with msc3861
+        #experimental_features = {
+        #  # Room summary API
+        #  msc3266_enabled = true;
+        #  # Rendezvous server for QR Code generation
+        #  msc4108_enabled = true;
+        #};
+
         federation_rr_transactions_per_room_per_second = 50;
         federation_client_minimum_tls_version = "1.2";
         forget_rooms_on_leave = true;
@@ -264,19 +275,6 @@ in
         user_ips_max_age = "28d";
 
         app_service_config_files = config.pub-solar-os.matrix.synapse.app-service-config-files;
-
-        modules = [
-          {
-            module = "matrix_http_rendezvous_synapse.SynapseRendezvousModule";
-            config = {
-              prefix = "/_synapse/client/org.matrix.msc3886/rendezvous";
-            };
-          }
-        ];
-
-        experimental_features = {
-          msc3886_endpoint = "/_synapse/client/org.matrix.msc3886/rendezvous";
-        };
       };
 
       withJemalloc = true;
@@ -288,14 +286,9 @@ in
         "redis"
       ];
 
-      plugins = with config.services.matrix-synapse.package.plugins; [
-        matrix-synapse-shared-secret-auth
-        matrix-http-rendezvous-synapse
-      ];
+      plugins = [ config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth ];
     };
 
-    systemd.services.matrix-synapse.environment.SYNAPSE_ASYNC_IO_REACTOR = "1";
-
     services.matrix-authentication-service = {
       enable = true;
       createDatabase = true;

modules/nginx-matrix/default.nix

@@ -24,14 +24,6 @@ let
       secure_backup_required = false;
       secure_backup_setup_methods = [ ];
     };
-    "m.integrations" = {
-      managers = [
-        {
-          api_url = "https://dimension.${domain}/api/v1/scalar";
-          ui_url = "https://dimension.${domain}/element";
-        }
-      ];
-    };
   };
   wellKnownServer = domain: { "m.server" = "matrix.${domain}:8448"; };
   wellKnownSupport = {