Synapse config fixes

2 files changed, 7 insertions, 5 deletions

diff --git a/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix

index d0b1774..22312f4 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/federation-sender.nix
@@ -15,6 +15,7 @@ in
       send_federation = false;
       federation_sender_instances = lib.map (index: "federation_sender-${toString index}") federationSenders;
       outbound_federation_restricted_to = lib.map (index: "federation_sender-${toString index}") federationSenders;
+      worker_replication_secret = "federation_sender_secret";
     };
 
     workers = lib.listToAttrs (
@@ -25,7 +26,7 @@ in
           worker_listeners = [
             {
               type = "http";
-              path = "/run/matrix-synapse/pusher-${toString index}.sock";
+              path = "/run/matrix-synapse/federation_sender-${toString index}.sock";
               resources = [
                 {
                   names = [ "replication" ];
diff --git a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix

index dba4721..4dbf4ee 100644
--- a/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
+++ b/host/Rory-nginx/services/matrix/synapse/workers/stream-writers/event-stream-writer.nix
@@ -7,21 +7,22 @@
 let
   cfg = config.services.matrix-synapse;
   streamWriters = lib.range 0 (cfg.eventStreamWriters - 1);
+  streamWriterType = "events";
 in
 {
   services.matrix-synapse = lib.mkIf (cfg.eventStreamWriters > 0) {
     settings = {
       instance_map = lib.listToAttrs (
         lib.map (port: {
-          name = "stream-writer-${toString port}";
+          name = "stream-writer-${streamWriterType}-${toString port}";
           value = {
-            path = "/run/matrix-synapse/stream-writer-${toString port}.sock";
+            path = "/run/matrix-synapse/stream_writer-${streamWriterType}-${toString port}.sock";
           };
         }) streamWriters
       );
 
       stream_writers = {
-        events = lib.map (index: "stream-writer-events-${toString index}") streamWriters;
+        events = lib.map (index: "stream_writer-${streamWriterType}-${toString index}") streamWriters;
       };
     };
 
@@ -33,7 +34,7 @@ in
           worker_listeners = [
             {
               type = "http";
-              path = "/run/matrix-synapse/stream-writer-${toString index}.sock";
+              path = "/run/matrix-synapse/stream_writer-${streamWriterType}-${toString index}.sock";
               resources = [
                 {
                   names = [ "replication" ];