From af224d83121033e973d13ba720cba6cb4bdc706e Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Wed, 19 Jul 2023 00:25:22 +0300
Subject: [PATCH] update worker config to use instance map

---
 roles/synapse/templates/conf.d/workers.yaml.j2 | 5 +++--
 roles/synapse/templates/worker.yaml.j2         | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/roles/synapse/templates/conf.d/workers.yaml.j2 b/roles/synapse/templates/conf.d/workers.yaml.j2
index 35876d9..56be545 100644
--- a/roles/synapse/templates/conf.d/workers.yaml.j2
+++ b/roles/synapse/templates/conf.d/workers.yaml.j2
@@ -18,9 +18,11 @@ update_user_directory_from_worker: user_dir-0
 
 {% if 'event_persister' in synapse_workers or 'typing_persister' in synapse_workers or 'account_persister' in synapse_workers or 'device_persister' in synapse_workers or 'presence_persister' in synapse_workers or 'receipt_persister' in synapse_workers %}
 instance_map:
+  main:
+    host: localhost
+    port: 9093
 
 {% for persister_type in persister_workers %}
-
 {% if persister_type in synapse_workers %}
 {% for port in synapse_workers[persister_type] %}
   {{ persister_type }}-{{ loop.index0 }}:
@@ -28,7 +30,6 @@ instance_map:
     port: {{ port }}
 {% endfor %}
 {% endif %}
-
 {% endfor %}
 
 stream_writers:
diff --git a/roles/synapse/templates/worker.yaml.j2 b/roles/synapse/templates/worker.yaml.j2
index 7dc46b9..4f6c4bf 100644
--- a/roles/synapse/templates/worker.yaml.j2
+++ b/roles/synapse/templates/worker.yaml.j2
@@ -2,10 +2,6 @@
 worker_app: synapse.app.{{ worker_app }}
 worker_name: {{ worker }}
 
-# The replication listener on the synapse to talk to.
-worker_replication_host: 127.0.0.1
-worker_replication_http_port: 9093
-
 worker_log_config: /etc/matrix-synapse/worker-logs/{{ worker }}-log.yaml
 {% if worker_port is defined and worker_listeners|length !=0 or synapse_metrics %}
 worker_listeners: