Move matrix-bot-maubot to its own container network and add native Traefik support

roles/custom/matrix-bot-maubot/tasks/inject_into_nginx_proxy.yml

@@ -1,42 +0,0 @@
----
-
-- name: Configure nginx for maubot
-  block:
-    - name: Generate Maubot proxying configuration for matrix-nginx-proxy
-      ansible.builtin.set_fact:
-        matrix_bot_maubot_matrix_nginx_proxy_configuration: |
-          location ~ ^/(_matrix/maubot/.*) {
-          {% 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-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}";
-             proxy_pass http://$backend$request_uri;
-             proxy_set_header Upgrade $http_upgrade;
-             proxy_set_header Connection "upgrade";
-          {% else %}
-            {# Generic configuration for use outside of our container setup #}
-            proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}$request_uri;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-          {% endif %}
-          }
-      when: matrix_bot_maubot_proxy_management_interface | bool
-
-    - name: Register Maubot's 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_bot_maubot_matrix_nginx_proxy_configuration]
-          }}
-      when: matrix_bot_maubot_proxy_management_interface | bool
-
-    - name: Warn about reverse-proxying if matrix-nginx-proxy not used
-      ansible.builtin.debug:
-        msg: >-
-          NOTE: You've enabled Maubot but are not using the matrix-nginx-proxy
-          reverse proxy.
-          Please make sure that you're proxying the `/_matrix/maubot`
-          URL endpoint to the matrix-maubot container.
-      when: "matrix_bot_maubot_enabled | bool and matrix_bot_maubot_proxy_management_interface | bool and matrix_nginx_proxy_enabled is not defined"

roles/custom/matrix-bot-maubot/tasks/main.yml

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

roles/custom/matrix-bot-maubot/tasks/setup_install.yml

@@ -60,6 +60,21 @@
       pull: true
   when: "matrix_bot_maubot_container_image_self_build|bool"
 
+- name: Ensure maubot support files installed
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/{{ item }}.j2"
+    dest: "{{ matrix_bot_maubot_base_path }}/{{ item }}"
+    mode: 0640
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - labels
+
+- name: Ensure maubot container network is created
+  community.general.docker_network:
+    name: "{{ matrix_bot_maubot_container_network }}"
+    driver: bridge
+
 - name: Ensure matrix-bot-maubot.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-bot-maubot.service.j2"

roles/custom/matrix-bot-maubot/tasks/validate_config.yml

@@ -1,11 +1,24 @@
 ---
 
+- name: (Deprecation) Catch and report renamed maubot variables
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which now has a different name.
+      Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
+  when: "item.old in vars"
+  with_items:
+    - {'old': 'matrix_bot_maubot_management_interface_port', 'new': 'matrix_bot_maubot_server_port'}
+    - {'old': 'matrix_bot_maubot_management_interface_http_bind_port', 'new': 'matrix_bot_maubot_container_management_interface_http_bind_port'}
+
 - name: Fail if required maubot settings not defined
   ansible.builtin.fail:
     msg: >-
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and vars[item.name] == ''"
   with_items:
+    - {'name': 'matrix_bot_maubot_hostname', when: true}
+    - {'name': 'matrix_bot_maubot_path_prefix', when: true}
     - {'name': 'matrix_bot_maubot_unshared_secret', when: true}
     - {'name': 'matrix_bot_maubot_admins', when: true}
     - {'name': 'matrix_bot_maubot_database_hostname', when: "{{ matrix_bot_maubot_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_bot_maubot_container_network', when: true}