From 3eae029697454a75f4a6057827aad8bcef83d06e Mon Sep 17 00:00:00 2001
From: magic_rb <magic_rb@redalder.org>
Date: Mon, 18 Nov 2024 00:25:09 +0100
Subject: [PATCH] Revert "Changes to matrix"

This reverts commit 465549d00b37dbf976b6b19d58653abab07a57f0.
---
 nixng/containers/matrix/synapse/default.nix        | 4 ----
 nixng/containers/matrix/synapse/generic_worker.nix | 6 ++----
 nixng/containers/matrix/synapse/synapse.nix        | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixng/containers/matrix/synapse/default.nix b/nixng/containers/matrix/synapse/default.nix
index b49b7e9..08033b3 100644
--- a/nixng/containers/matrix/synapse/default.nix
+++ b/nixng/containers/matrix/synapse/default.nix
@@ -30,7 +30,6 @@ in {
   flake.nixngConfigurations.synapseFederationSender = callPackage ./generic_worker.nix {
     name = "generic";
     listener_resources = singleton "health";
-    port = 6171;
   };
   flake.nixngConfigurations.synapseFederationReceiver = callPackage ./generic_worker.nix {
     name = "generic";
@@ -38,7 +37,6 @@ in {
       "health"
       "federation"
     ];
-    port = 6170;
   };
   flake.nixngConfigurations.synapseClient = callPackage ./generic_worker.nix {
     name = "generic";
@@ -46,7 +44,6 @@ in {
       "client"
       "health"
     ];
-    port = 6168;
   };
   flake.nixngConfigurations.synapseSync = callPackage ./generic_worker.nix {
     name = "generic";
@@ -54,7 +51,6 @@ in {
       "client"
       "health"
     ];
-    port = 6169;
   };
   flake.nixngConfigurations.synapseRedis = callPackage ./redis.nix {};
   flake.nixngConfigurations.synapsePostgreSQL = callPackage ./postgresql.nix {};
diff --git a/nixng/containers/matrix/synapse/generic_worker.nix b/nixng/containers/matrix/synapse/generic_worker.nix
index f664796..7793867 100644
--- a/nixng/containers/matrix/synapse/generic_worker.nix
+++ b/nixng/containers/matrix/synapse/generic_worker.nix
@@ -5,7 +5,6 @@
   name,
   logConfig,
   commonConfig,
-  port,
 }:
 makeSystem {
   system = "x86_64-linux";
@@ -30,15 +29,14 @@ makeSystem {
       settings = mkMerge [
         {
           worker_app = "synapse.app.generic_worker";
-          worker_name = "worker-${name}";
 
           worker_listeners = [
             {
-              inherit port;
+              port = 6167;
               tls = false;
               type = "http";
               x_forwarded = true;
-              bind_addresses = ["0.0.0.0"];
+              bind_adrresses = ["0.0.0.0"];
               resources = [
                 {
                   names = listener_resources;
diff --git a/nixng/containers/matrix/synapse/synapse.nix b/nixng/containers/matrix/synapse/synapse.nix
index e2eeddc..4203878 100644
--- a/nixng/containers/matrix/synapse/synapse.nix
+++ b/nixng/containers/matrix/synapse/synapse.nix
@@ -45,7 +45,7 @@ makeSystem {
               tls = false;
               type = "http";
               x_forwarded = true;
-              bind_addresses = ["0.0.0.0"];
+              bind_adrresses = ["0.0.0.0"];
               resources = singleton {
                 names = ["client" "federation"];
                 compress = false;