Move matrix-registration service to its own network and add native Traefik support

roles/custom/matrix-registration/tasks/inject_into_nginx_proxy.yml

@@ -1,55 +0,0 @@
----
-
-- name: Fail if matrix-nginx-proxy role already executed
-  ansible.builtin.fail:
-    msg: >-
-      Trying to append matrix-registration'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-registration role.
-  when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-- name: Generate matrix-registration proxying configuration for matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_registration_matrix_nginx_proxy_configuration: |
-      rewrite ^{{ matrix_registration_public_endpoint }}$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/ permanent;
-      rewrite ^{{ matrix_registration_public_endpoint }}/$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_registration_public_endpoint }}/register redirect;
-
-      location ~ ^{{ matrix_registration_public_endpoint }}/(.*) {
-      {% 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-registration:5000";
-        proxy_pass http://$backend/$1;
-      {% else %}
-        {# Generic configuration for use outside of our container setup #}
-        proxy_pass http://127.0.0.1:8767/$1;
-      {% endif %}
-
-        {#
-          Workaround matrix-registration serving the background image at /static
-          (see https://github.com/ZerataX/matrix-registration/issues/47)
-        #}
-        sub_filter_once off;
-        sub_filter_types text/css;
-        sub_filter "/static/" "{{ matrix_registration_public_endpoint }}/static/";
-      }
-
-- name: Register matrix-registration proxying configuration with matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
-      {{
-        matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks | default([])
-        +
-        [matrix_registration_matrix_nginx_proxy_configuration]
-      }}
-
-- name: Warn about reverse-proxying if matrix-nginx-proxy not used
-  ansible.builtin.debug:
-    msg: >-
-      NOTE: You've enabled the matrix-registration tool but are not using the matrix-nginx-proxy
-      reverse proxy.
-      Please make sure that you're proxying the `{{ matrix_registration_public_endpoint }}`
-      URL endpoint to the matrix-registration container.
-      You can expose the container's port using the `matrix_registration_container_http_host_bind_port` variable.
-  when: "not matrix_nginx_proxy_enabled | default(False) | bool"

roles/custom/matrix-registration/tasks/main.yml

@@ -1,14 +1,5 @@
 ---
 
-- tags:
-    - setup-all
-    - setup-nginx-proxy
-    - install-all
-    - install-nginx-proxy
-  block:
-    - when: matrix_registration_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
-
 - tags:
     - setup-all
     - setup-matrix-registration

roles/custom/matrix-registration/tasks/setup_install.yml

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

roles/custom/matrix-registration/tasks/validate_config.yml

@@ -6,6 +6,9 @@
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and vars[item.name] == ''"
   with_items:
+    - {'name': 'matrix_registration_hostname', when: true}
+    - {'name': 'matrix_registration_path_prefix', when: true}
+    - {'name': 'matrix_registration_container_network', when: true}
     - {'name': 'matrix_registration_shared_secret', when: true}
     - {'name': 'matrix_registration_admin_secret', when: true}
     - {'name': 'matrix_registration_server_location', when: true}
@@ -19,3 +22,4 @@
   when: "item.old in vars"
   with_items:
     - {'old': 'matrix_registration_docker_repo', 'new': 'matrix_registration_container_image_self_build_repo'}
+    - {'old': 'matrix_registration_public_endpoint', 'new': 'matrix_registration_path_prefix'}