From a906b7859e6520a4b16f78fe37689f145806d6a8 Mon Sep 17 00:00:00 2001 From: deathrow Date: Mon, 5 Dec 2022 16:55:57 -0500 Subject: [PATCH] Worker TLS --- files/workers/additional1.yaml | 3 +-- files/workers/additional2.yaml | 3 +-- files/workers/event1.yaml | 3 +-- files/workers/event2.yaml | 3 +-- files/workers/federation1.yaml | 3 +-- files/workers/federation2.yaml | 3 +-- files/workers/federation3.yaml | 3 +-- files/workers/sync1.yaml | 4 +--- files/workers/sync2.yaml | 4 +--- files/workers/sync3.yaml | 4 +--- files/workers/sync4.yaml | 3 +-- files/workers/sync5.yaml | 4 +--- files/workers/worker1.yaml | 4 +--- files/workers/worker2.yaml | 4 +--- files/workers/worker3.yaml | 4 +--- files/workers/worker4.yaml | 4 +--- 16 files changed, 16 insertions(+), 40 deletions(-) diff --git a/files/workers/additional1.yaml b/files/workers/additional1.yaml index 1062f30..279186d 100644 --- a/files/workers/additional1.yaml +++ b/files/workers/additional1.yaml @@ -1,11 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: additional1 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/additional1.yaml worker_listeners: diff --git a/files/workers/additional2.yaml b/files/workers/additional2.yaml index 08db784..fd692f9 100644 --- a/files/workers/additional2.yaml +++ b/files/workers/additional2.yaml @@ -1,11 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: additional2 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/additional2.yaml worker_listeners: diff --git a/files/workers/event1.yaml b/files/workers/event1.yaml index 104a79e..5f4234b 100644 --- a/files/workers/event1.yaml +++ b/files/workers/event1.yaml @@ -1,10 +1,9 @@ worker_app: synapse.app.generic_worker worker_name: event1 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_log_config: /data/log/event1.yaml worker_listeners: diff --git a/files/workers/event2.yaml b/files/workers/event2.yaml index c92a7ab..d98db36 100644 --- a/files/workers/event2.yaml +++ b/files/workers/event2.yaml @@ -1,10 +1,9 @@ worker_app: synapse.app.generic_worker worker_name: event2 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_log_config: /data/log/event2.yaml worker_listeners: diff --git a/files/workers/federation1.yaml b/files/workers/federation1.yaml index e56331a..1a7ff92 100644 --- a/files/workers/federation1.yaml +++ b/files/workers/federation1.yaml @@ -1,8 +1,7 @@ worker_app: synapse.app.federation_sender worker_name: federation1 -# The replication listener on the main synapse process. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_log_config: /data/log/federation1.yaml diff --git a/files/workers/federation2.yaml b/files/workers/federation2.yaml index abacf51..a0fa8cc 100644 --- a/files/workers/federation2.yaml +++ b/files/workers/federation2.yaml @@ -1,8 +1,7 @@ worker_app: synapse.app.federation_sender worker_name: federation2 -# The replication listener on the main synapse process. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_log_config: /data/log/federation2.yaml diff --git a/files/workers/federation3.yaml b/files/workers/federation3.yaml index 50c1f9b..e55514a 100644 --- a/files/workers/federation3.yaml +++ b/files/workers/federation3.yaml @@ -1,8 +1,7 @@ worker_app: synapse.app.federation_sender worker_name: federation3 -# The replication listener on the main synapse process. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_log_config: /data/log/federation3.yaml diff --git a/files/workers/sync1.yaml b/files/workers/sync1.yaml index 84356cd..d956fb5 100644 --- a/files/workers/sync1.yaml +++ b/files/workers/sync1.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: sync1 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/sync1.yaml worker_listeners: diff --git a/files/workers/sync2.yaml b/files/workers/sync2.yaml index 5e021da..271bb31 100644 --- a/files/workers/sync2.yaml +++ b/files/workers/sync2.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: sync2 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/sync2.yaml worker_listeners: diff --git a/files/workers/sync3.yaml b/files/workers/sync3.yaml index 5cb6526..cd75929 100644 --- a/files/workers/sync3.yaml +++ b/files/workers/sync3.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: sync3 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/sync3.yaml worker_listeners: diff --git a/files/workers/sync4.yaml b/files/workers/sync4.yaml index 6143315..0dd16d5 100644 --- a/files/workers/sync4.yaml +++ b/files/workers/sync4.yaml @@ -1,10 +1,9 @@ worker_app: synapse.app.generic_worker worker_name: sync4 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_main_http_uri: http://synapse:8008/ worker_log_config: /data/log/sync4.yaml diff --git a/files/workers/sync5.yaml b/files/workers/sync5.yaml index cd41822..159282b 100644 --- a/files/workers/sync5.yaml +++ b/files/workers/sync5.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: sync5 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/sync5.yaml worker_listeners: diff --git a/files/workers/worker1.yaml b/files/workers/worker1.yaml index 79b4476..34858fa 100644 --- a/files/workers/worker1.yaml +++ b/files/workers/worker1.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: worker1 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - +worker_replication_http_tls: true worker_main_http_uri: http://synapse:8008/ - worker_log_config: /data/log/worker1.yaml worker_listeners: diff --git a/files/workers/worker2.yaml b/files/workers/worker2.yaml index ad7f037..350a0a6 100644 --- a/files/workers/worker2.yaml +++ b/files/workers/worker2.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: worker2 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/worker2.yaml worker_listeners: diff --git a/files/workers/worker3.yaml b/files/workers/worker3.yaml index 5e28a07..8463ea4 100644 --- a/files/workers/worker3.yaml +++ b/files/workers/worker3.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: worker3 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/worker3.yaml worker_listeners: diff --git a/files/workers/worker4.yaml b/files/workers/worker4.yaml index 9fd1c8f..4c093f0 100644 --- a/files/workers/worker4.yaml +++ b/files/workers/worker4.yaml @@ -1,12 +1,10 @@ worker_app: synapse.app.generic_worker worker_name: worker4 -# The replication listener on the synapse to talk to. worker_replication_host: synapse worker_replication_http_port: 9093 - worker_main_http_uri: http://synapse:8008/ - +worker_replication_http_tls: true worker_log_config: /data/log/worker4.yaml worker_listeners: