update workers to make them consistent

docker-compose.yaml

@@ -55,10 +55,10 @@ services:
     depends_on:
       - postgres
 
-  synapse-worker-1:
+  synapse-generic-worker-1:
     image: matrixdotorg/synapse:${SYNAPSE_IMAGE_TAG}
     restart: unless-stopped
-    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/generic_worker_1.yaml"]
+    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/workers/synapse-generic-worker-1.yaml"]
     healthcheck:
       test: ["CMD-SHELL", "curl -fSs http://localhost:8081/health || exit 1"]
       start_period: "5s"
@@ -81,10 +81,10 @@ services:
     depends_on:
       - synapse
 
-  synapse-worker-2:
+  synapse-generic-worker-2:
     image: matrixdotorg/synapse:${SYNAPSE_IMAGE_TAG}
     restart: unless-stopped
-    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/generic_worker_2.yaml"]
+    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/workers/synapse-generic-worker-2.yaml"]
     healthcheck:
       test: ["CMD-SHELL", "curl -fSs http://localhost:8081/health || exit 1"]
       start_period: "5s"
@@ -110,7 +110,7 @@ services:
   synapse-federation-sender-1:
     image: matrixdotorg/synapse:${SYNAPSE_IMAGE_TAG}
     restart: unless-stopped
-    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/federation_sender_worker_1.yaml"]
+    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/workers/synapse-federation-sender-1.yaml"]
     healthcheck:
       disable: true
     volumes:
@@ -132,7 +132,7 @@ services:
   synapse-federation-sender-2:
     image: matrixdotorg/synapse:${SYNAPSE_IMAGE_TAG}
     restart: unless-stopped
-    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/federation_sender_worker_2.yaml"]
+    entrypoint: ["/start.py", "run", "--config-path=/data/${CONFIG_FILE_NAME}", "--config-path=/data/workers/synapse-federation-sender-2.yaml"]
     healthcheck:
       disable: true
     volumes:

example-worker-configs/federation_sender_worker_1.yaml

@@ -1,9 +0,0 @@
-worker_app: synapse.app.federation_sender
-worker_name: federation_sender_1
-
-# The replication listener on the main synapse process.
-worker_replication_host: synapse
-worker_replication_http_port: 9093
-
-
-worker_log_config: /data/federation_sender.log.config

example-worker-configs/federation_sender_worker_2.yaml

@@ -1,9 +0,0 @@
-worker_app: synapse.app.federation_sender
-worker_name: federation_sender_2
-
-# The replication listener on the main synapse process.
-worker_replication_host: synapse
-worker_replication_http_port: 9093
-
-
-worker_log_config: /data/federation_sender.log.config

example-worker-configs/generic_worker_1.yaml

@@ -1,17 +0,0 @@
-worker_app: synapse.app.generic_worker
-worker_name: worker1
-
-# The replication listener on the main synapse process.
-worker_replication_host: synapse
-worker_replication_http_port: 9093
-
-worker_listeners:
- - type: http
-   port: 8081
-   x_forwarded: true
-   resources:
-     - names:
-       - client
-       - federation
-
-worker_log_config: /data/worker.log.config

example-worker-configs/generic_worker_2.yaml

@@ -1,17 +0,0 @@
-worker_app: synapse.app.generic_worker
-worker_name: worker2
-
-# The replication listener on the main synapse process.
-worker_replication_host: synapse
-worker_replication_http_port: 9093
-
-worker_listeners:
- - type: http
-   port: 8081
-   x_forwarded: true
-   resources:
-     - names:
-       - client
-       - federation
-
-worker_log_config: /data/worker.log.config

example-worker-configs/synapse-federation-sender-1.yaml

@@ -0,0 +1,14 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-1
+
+# The replication listener on the main synapse process.
+worker_replication_host: synapse
+worker_replication_http_port: 9093
+
+worker_listeners:
+  - type: http
+    port: 8034
+    resources:
+      - names: [replication]
+
+worker_log_config: /data/workers/federation_sender.log.config

example-worker-configs/synapse-federation-sender-2.yaml

@@ -0,0 +1,14 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-2
+
+# The replication listener on the main synapse process.
+worker_replication_host: synapse
+worker_replication_http_port: 9093
+
+worker_listeners:
+  - type: http
+    port: 8034
+    resources:
+      - names: [replication]
+
+worker_log_config: /data/workers/federation_sender.log.config

example-worker-configs/synapse-generic-worker-1.yaml

@@ -0,0 +1,19 @@
+worker_app: synapse.app.generic_worker
+worker_name: synapse-generic-worker-1
+
+# The replication listener on the main synapse process.
+worker_replication_host: synapse
+worker_replication_http_port: 9093
+
+worker_listeners:
+  - type: http
+    port: 8034
+    resources:
+      - names: [replication]
+  - type: http
+    port: 8081
+    x_forwarded: true
+    resources:
+      - names: [client, federation]
+
+worker_log_config: /data/workers/worker.log.config

example-worker-configs/synapse-generic-worker-2.yaml

@@ -0,0 +1,19 @@
+worker_app: synapse.app.generic_worker
+worker_name: synapse-generic-worker-2
+
+# The replication listener on the main synapse process.
+worker_replication_host: synapse
+worker_replication_http_port: 9093
+
+worker_listeners:
+  - type: http
+    port: 8034
+    resources:
+      - names: [replication]
+  - type: http
+    port: 8081
+    x_forwarded: true
+    resources:
+      - names: [client, federation]
+
+worker_log_config: /data/workers/worker.log.config