Move matrix-bridge-mautrix-signal to its own container network and add native Traefik support

roles/custom/matrix-bridge-mautrix-signal/tasks/inject_into_nginx_proxy.yml

@@ -1,35 +0,0 @@
----
-
-- name: Fail if matrix-nginx-proxy role already executed
-  ansible.builtin.fail:
-    msg: >-
-      Trying to append mautrix-signal-metrics'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-bridge-mautrix-signal role.
-  when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-- when: matrix_mautrix_signal_metrics_proxying_enabled | bool
-  block:
-    - name: Generate mautrix-signal metrics proxying configuration for matrix-nginx-proxy (matrix.DOMAIN/metrics/mautrix-signal)
-      ansible.builtin.set_fact:
-        matrix_mautrix_signal_nginx_metrics_configuration_block: |
-          location /metrics/mautrix-signal {
-            {% 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-mautrix-signal:8001";
-              proxy_pass http://$backend/metrics;
-            {% else %}
-              return 404 "matrix-nginx-proxy is disabled and no host port was bound to the container, so metrics are unavailable";
-            {% endif %}
-          }
-
-    - name: Register mautrix-signal metrics proxying configuration with matrix-nginx-proxy (matrix.DOMAIN/metrics/mautrix-signal)
-      ansible.builtin.set_fact:
-        matrix_nginx_proxy_proxy_matrix_metrics_additional_system_location_configuration_blocks: |
-          {{
-            matrix_nginx_proxy_proxy_matrix_metrics_additional_system_location_configuration_blocks | default([])
-            +
-            [matrix_mautrix_signal_nginx_metrics_configuration_block]
-          }}

roles/custom/matrix-bridge-mautrix-signal/tasks/main.yml

@@ -8,15 +8,6 @@
   block:
     - ansible.builtin.include_tasks: "{{ role_path }}/tasks/remove_legacy.yml"
 
-- tags:
-    - setup-all
-    - setup-nginx-proxy
-    - install-all
-    - install-nginx-proxy
-  block:
-    - when: matrix_mautrix_signal_enabled | bool and matrix_mautrix_signal_metrics_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
-
 - tags:
     - setup-all
     - setup-mautrix-signal

roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml

@@ -126,6 +126,21 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
+- name: Ensure mautrix-signal support files installed
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/{{ item }}.j2"
+    dest: "{{ matrix_mautrix_signal_base_path }}/{{ item }}"
+    mode: 0640
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - labels
+
+- name: Ensure matrix-mautrix-signal container network is created
+  community.general.docker_network:
+    name: "{{ matrix_mautrix_signal_container_network }}"
+    driver: bridge
+
 - name: Ensure matrix-mautrix-signal.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-mautrix-signal.service.j2"

roles/custom/matrix-bridge-mautrix-signal/tasks/validate_config.yml

@@ -10,6 +10,9 @@
     - {'name': 'matrix_mautrix_signal_homeserver_address', when: true}
     - {'name': 'matrix_mautrix_signal_homeserver_token', when: true}
     - {'name': 'matrix_mautrix_signal_database_hostname', when: "{{ matrix_mautrix_signal_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_mautrix_signal_container_network', when: true}
+    - {'name': 'matrix_mautrix_signal_metrics_proxying_hostname', when: "{{ matrix_mautrix_signal_metrics_proxying_enabled }}"}
+    - {'name': 'matrix_mautrix_signal_metrics_proxying_path_prefix', when: "{{ matrix_mautrix_signal_metrics_proxying_enabled }}"}
 
 - name: (Deprecation) Catch and report renamed settings
   ansible.builtin.fail: