From 66bc26a1133c432f6349891dbdd557379efbc837 Mon Sep 17 00:00:00 2001
From: magic_rb <richard@brezak.sk>
Date: Sat, 7 Oct 2023 17:34:09 +0200
Subject: [PATCH] `worker_replication_host` is no longer supported by Synapse

Signed-off-by: magic_rb <richard@brezak.sk>
---
 .../matrix/synapse/common_config.nix          |  4 ++++
 .../matrix/synapse/generic_worker.nix         |  4 ----
 terranix/containers/matrix/matrix-synapse.hcl | 20 -------------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/nixng/containers/matrix/synapse/common_config.nix b/nixng/containers/matrix/synapse/common_config.nix
index 3f22e5e..e9171aa 100644
--- a/nixng/containers/matrix/synapse/common_config.nix
+++ b/nixng/containers/matrix/synapse/common_config.nix
@@ -18,4 +18,8 @@
   federation_sender_instances = [
     "worker-federation-sender-0"
   ];
+  instance_map.main = {
+    host = "localhost";
+    port = 9093;
+  };
 }
diff --git a/nixng/containers/matrix/synapse/generic_worker.nix b/nixng/containers/matrix/synapse/generic_worker.nix
index 9a33a48..c46e7e0 100644
--- a/nixng/containers/matrix/synapse/generic_worker.nix
+++ b/nixng/containers/matrix/synapse/generic_worker.nix
@@ -21,10 +21,6 @@ makeSystem {
         settings = {
           worker_app = "synapse.app.generic_worker";
 
-          # The replication listener on the main synapse process.
-          worker_replication_host = "127.0.0.1";
-          worker_replication_http_port = 9093;
-
           worker_listeners = [
             {
               port = 6167;
diff --git a/terranix/containers/matrix/matrix-synapse.hcl b/terranix/containers/matrix/matrix-synapse.hcl
index 430a326..5b8a704 100644
--- a/terranix/containers/matrix/matrix-synapse.hcl
+++ b/terranix/containers/matrix/matrix-synapse.hcl
@@ -242,10 +242,6 @@ database:
 redis:
   enabled: true
   password: "{{ .Data.data.redis_password }}"
-instance_map:
-  main:
-    host: localhost
-    port: 9093
 {{ end }}
 EOF
         destination = "/secrets/extra.yaml"
@@ -403,10 +399,6 @@ database:
 redis:
   enabled: true
   password: "{{ .Data.data.redis_password }}"
-instance_map:
-  main:
-    host: localhost
-    port: 9093
 {{ end }}
 EOF
         destination = "/secrets/extra.yaml"
@@ -564,10 +556,6 @@ database:
 redis:
   enabled: true
   password: "{{ .Data.data.redis_password }}"
-instance_map:
-  main:
-    host: localhost
-    port: 9093
 {{ end }}
 EOF
         destination = "/secrets/extra.yaml"
@@ -725,10 +713,6 @@ database:
 redis:
   enabled: true
   password: "{{ .Data.data.redis_password }}"
-instance_map:
-  main:
-    host: localhost
-    port: 9093
 {{ end }}
 EOF
         destination = "/secrets/extra.yaml"
@@ -971,10 +955,6 @@ database:
 redis:
   enabled: true
   password: "{{ .Data.data.redis_password }}"
-instance_map:
-  main:
-    host: localhost
-    port: 9093
 {{ end }}
 EOF
         destination = "/secrets/extra.yaml"