diff --git a/roles/custom/matrix-synapse/tasks/init.yml b/roles/custom/matrix-synapse/tasks/init.yml index 66539d0da..234eb78e5 100644 --- a/roles/custom/matrix-synapse/tasks/init.yml +++ b/roles/custom/matrix-synapse/tasks/init.yml @@ -11,48 +11,3 @@ loop_control: loop_var: matrix_synapse_worker_details when: matrix_synapse_workers_enabled | bool - -- when: matrix_synapse_metrics_proxying_enabled | bool - block: - - name: Fail if matrix-nginx-proxy role already executed - ansible.builtin.fail: - msg: >- - Trying to append Synapse's reverse-proxying configuration to matrix-nginx-proxy, - but it's pointless since the matrix-nginx-proxy role had already executed. - To fix this, please change the order of roles in your playbook, - so that the matrix-nginx-proxy role would run after the matrix-synapse role. - when: matrix_nginx_proxy_role_executed | default(False) | bool - - - name: Generate synapse metrics proxying configuration for matrix-nginx-proxy (matrix.DOMAIN/metrics/synapse/main-process) - ansible.builtin.set_fact: - matrix_synapse_nginx_metrics_configuration_block: | - location /metrics/synapse/main-process { - {% if matrix_nginx_proxy_enabled | default(False) %} - {# Use the embedded DNS resolver in Docker containers to discover the service #} - resolver 127.0.0.11 valid=5s; - set $backend "matrix-synapse:{{ matrix_synapse_metrics_port }}"; - proxy_pass http://$backend/_synapse/metrics; - {% else %} - {# Generic configuration for use outside of our container setup #} - proxy_pass http://127.0.0.1:{{ matrix_synapse_metrics_port }}/_synapse/metrics; - {% endif %} - } - -# Injection code was here - - - name: Generate synapse worker metrics proxying configuration for matrix-nginx-proxy (matrix.DOMAIN/metrics/synapse/worker) - ansible.builtin.set_fact: - matrix_synapse_worker_nginx_metrics_configuration_block: | - {% for worker in matrix_synapse_workers_enabled_list %} - {% if worker.metrics_port != 0 %} - location /metrics/synapse/worker/{{ worker.id }} { - resolver 127.0.0.11 valid=5s; - set $backend "{{ worker.name }}:{{ worker.metrics_port }}"; - proxy_pass http://$backend/_synapse/metrics; - proxy_set_header Host $host; - } - {% endif %} - {% endfor %} - when: matrix_synapse_workers_enabled_list | length > 0 - -# Injection code was here