mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-08 11:47:36 +01:00
226c550ffa
As stream writer workers are also powered by the `generic_worker` Synapse app, this necessitated that we provide means for distinguishing between them and regular `generic_workers`. I've also taken the time to optimize nginx configuration generation (more Jinja2 macro usage, less duplication). Worker names have also changed. Workers are now named sequentially like this: - `matrix-synapse-worker-0-generic` - `matrix-synapse-worker-1-stream-writer-typing` - `matrix-synapse-worker-2-pusher` instead of `matrix-synapse-worker_generic_worker-18111` (indexed with a port number). People who modify `matrix_synapse_workers_enabled_list` directly will need to adjust their configuration.
65 lines
2.3 KiB
Django/Jinja
65 lines
2.3 KiB
Django/Jinja
#jinja2: lstrip_blocks: "True"
|
|
worker_app: synapse.app.{{ matrix_synapse_worker_details.app }}
|
|
worker_name: {{ matrix_synapse_worker_details.name }}
|
|
|
|
{% if matrix_synapse_replication_listener_enabled %}
|
|
worker_replication_host: matrix-synapse
|
|
worker_replication_http_port: {{ matrix_synapse_replication_http_port }}
|
|
{% endif %}
|
|
|
|
{% set http_resources = [] %}
|
|
|
|
{% if matrix_synapse_worker_details.type == 'user_dir' %}
|
|
{% set http_resources = http_resources + ['client'] %}
|
|
{% endif %}
|
|
{% if matrix_synapse_worker_details.type == 'generic_worker' %}
|
|
{% set http_resources = http_resources + ['client', 'federation'] %}
|
|
{% endif %}
|
|
{#
|
|
None of the background workers need to handle federation traffic.
|
|
Only some of the stream writers need to handle client traffic.
|
|
#}
|
|
{% if matrix_synapse_worker_details.type == 'stream_writer' and matrix_synapse_worker_details.webserving %}
|
|
{% set http_resources = http_resources + ['client'] %}
|
|
{% endif %}
|
|
{% if matrix_synapse_worker_details.type == 'media_repository' %}
|
|
{% set http_resources = http_resources + ['media'] %}
|
|
{% endif %}
|
|
|
|
{% set replication_http_resources = [] %}
|
|
{% if matrix_synapse_worker_details.type == 'stream_writer' %}
|
|
{# All background workers need to handle replication traffic. #}
|
|
{% set replication_http_resources = replication_http_resources + ['replication'] %}
|
|
{% endif %}
|
|
|
|
{% if http_resources|length > 0 or matrix_synapse_metrics_enabled or replication_http_resources|length > 0 %}
|
|
worker_listeners:
|
|
{% if http_resources|length > 0 %}
|
|
- type: http
|
|
bind_addresses: ['::']
|
|
x_forwarded: true
|
|
port: {{ matrix_synapse_worker_details.port }}
|
|
resources:
|
|
- names: {{ http_resources|to_json }}
|
|
{% endif %}
|
|
{% if matrix_synapse_metrics_enabled %}
|
|
- type: metrics
|
|
bind_addresses: ['0.0.0.0']
|
|
port: {{ matrix_synapse_worker_details.metrics_port }}
|
|
{% endif %}
|
|
{% if replication_http_resources|length > 0 %}
|
|
- type: http
|
|
bind_addresses: ['::']
|
|
port: {{ matrix_synapse_worker_details.replication_port }}
|
|
resources:
|
|
- names: {{ replication_http_resources|to_json }}
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{% if matrix_synapse_worker_details.type == 'generic_worker' %}
|
|
worker_main_http_uri: http://matrix-synapse:{{ matrix_synapse_container_client_api_port }}
|
|
{% endif %}
|
|
|
|
worker_daemonize: false
|
|
worker_log_config: /data/{{ matrix_server_fqn_matrix }}.log.config
|