diff --git a/files/homeserver.yaml b/files/homeserver.yaml index d7c9ce2..3f67b10 100644 --- a/files/homeserver.yaml +++ b/files/homeserver.yaml @@ -5,9 +5,6 @@ # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html # Configuration file for Synapse. - - - modules: - module: mjolnir.Module config: @@ -148,8 +145,8 @@ federation_rr_transactions_per_room_per_second: 50 media_store_path: "/data/media_store" -max_upload_size: 50M -max_image_pixels: 50M +max_upload_size: 10M +max_image_pixels: 10M url_preview_enabled: true url_preview_ip_range_blacklist: @@ -216,3 +213,25 @@ redis: enabled: true host: redis port: 6379 + +instance_map: + main: + host: synapse + port: 9093 + tls: false + worker1: + host: synapse + port: 8080 + tls: false + worker2: + host: synapse + port: 8081 + tls: false + worker3: + host: synapse + port: 8082 + tls: false + worker4: + host: synapse + port: 8083 + tls: false \ No newline at end of file diff --git a/images/synapse-docker/Dockerfile b/images/synapse-docker/Dockerfile index 2e23c53..6437578 100644 --- a/images/synapse-docker/Dockerfile +++ b/images/synapse-docker/Dockerfile @@ -1,4 +1,4 @@ -ARG SYNAPSE_VERSION=1.87 +ARG SYNAPSE_VERSION=1.88.0rc1 ARG HARDENED_MALLOC_VERSION=11 ARG UID=991 ARG GID=991 diff --git a/images/synapse-worker-docker/Dockerfile b/images/synapse-worker-docker/Dockerfile index 21c4338..1dcad66 100644 --- a/images/synapse-worker-docker/Dockerfile +++ b/images/synapse-worker-docker/Dockerfile @@ -1,4 +1,4 @@ -ARG SYNAPSE_VERSION=1.87 +ARG SYNAPSE_VERSION=1.88.0rc1 ARG HARDENED_MALLOC_VERSION=11 ARG UID=991 ARG GID=991 diff --git a/workers/federation1.yaml b/workers/federation1.yaml index 0d41a81..5c56305 100755 --- a/workers/federation1.yaml +++ b/workers/federation1.yaml @@ -1,7 +1,3 @@ worker_app: synapse.app.generic_worker worker_name: federation1 - -worker_replication_host: synapse -worker_replication_http_port: 9093 -worker_replication_http_tls: false worker_log_config: /data/log/federation1.yaml diff --git a/workers/federation2.yaml b/workers/federation2.yaml index d9ffa4b..3ca883d 100755 --- a/workers/federation2.yaml +++ b/workers/federation2.yaml @@ -1,7 +1,3 @@ worker_app: synapse.app.generic_worker worker_name: federation2 - -worker_replication_host: synapse -worker_replication_http_port: 9093 -worker_replication_http_tls: false worker_log_config: /data/log/federation2.yaml diff --git a/workers/federation3.yaml b/workers/federation3.yaml index 312f4ad..84216b4 100755 --- a/workers/federation3.yaml +++ b/workers/federation3.yaml @@ -1,7 +1,3 @@ worker_app: synapse.app.generic_worker worker_name: federation3 - -worker_replication_host: synapse -worker_replication_http_port: 9093 -worker_replication_http_tls: false worker_log_config: /data/log/federation3.yaml diff --git a/workers/federation4.yaml b/workers/federation4.yaml index b85526d..c75b6ff 100755 --- a/workers/federation4.yaml +++ b/workers/federation4.yaml @@ -1,7 +1,3 @@ worker_app: synapse.app.generic_worker worker_name: federation4 - -worker_replication_host: synapse -worker_replication_http_port: 9093 -worker_replication_http_tls: false worker_log_config: /data/log/federation4.yaml diff --git a/workers/worker1.yaml b/workers/worker1.yaml index 58770d1..a1c0572 100755 --- a/workers/worker1.yaml +++ b/workers/worker1.yaml @@ -1,9 +1,5 @@ worker_app: synapse.app.generic_worker worker_name: worker1 - -worker_replication_host: synapse -worker_replication_http_port: 9093 -worker_replication_http_tls: false worker_main_http_uri: http://synapse:8008/ worker_log_config: /data/log/worker1.yaml @@ -13,6 +9,7 @@ worker_listeners: x_forwarded: true resources: - names: [client, federation] + - type: metrics port: 9000 diff --git a/workers/worker2.yaml b/workers/worker2.yaml index a53b2f8..e24f28f 100755 --- a/workers/worker2.yaml +++ b/workers/worker2.yaml @@ -1,10 +1,6 @@ worker_app: synapse.app.generic_worker worker_name: worker2 - -worker_replication_host: synapse -worker_replication_http_port: 9093 worker_main_http_uri: http://synapse:8008/ -worker_replication_http_tls: false worker_log_config: /data/log/worker2.yaml worker_listeners: @@ -13,6 +9,6 @@ worker_listeners: x_forwarded: true resources: - names: [client, federation] - + - type: metrics port: 9000 diff --git a/workers/worker3.yaml b/workers/worker3.yaml index f5d9ae4..2dab490 100755 --- a/workers/worker3.yaml +++ b/workers/worker3.yaml @@ -1,10 +1,6 @@ worker_app: synapse.app.generic_worker worker_name: worker3 - -worker_replication_host: synapse -worker_replication_http_port: 9093 worker_main_http_uri: http://synapse:8008/ -worker_replication_http_tls: false worker_log_config: /data/log/worker3.yaml worker_listeners: diff --git a/workers/worker4.yaml b/workers/worker4.yaml index 9d27d23..ad7c65b 100755 --- a/workers/worker4.yaml +++ b/workers/worker4.yaml @@ -1,10 +1,6 @@ worker_app: synapse.app.generic_worker worker_name: worker4 - -worker_replication_host: synapse -worker_replication_http_port: 9093 worker_main_http_uri: http://synapse:8008/ -worker_replication_http_tls: false worker_log_config: /data/log/worker4.yaml worker_listeners: