Move matrix-bridge-mx-puppet-twitter to its own container network and add native Traefik support

roles/custom/matrix-bridge-mx-puppet-twitter/tasks/inject_into_nginx_proxy.yml

@@ -1,44 +0,0 @@
----
-
-- name: Fail if matrix-nginx-proxy role already executed
-  ansible.builtin.fail:
-    msg: >-
-      Trying to append Twitter Appservice'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-mx-puppet-twitter role.
-  when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-- name: Generate Matrix MX Puppet Twitter proxying configuration for matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_mx_puppet_twitter_matrix_nginx_proxy_configuration: |
-      location {{ matrix_mx_puppet_twitter_webhook_path }} {
-      {% 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_mx_puppet_twitter_appservice_address }}";
-          proxy_pass $backend;
-      {% else %}
-          {# Generic configuration for use outside of our container setup #}
-          proxy_pass http://127.0.0.1:{{ matrix_mx_puppet_twitter_appservice_port }};
-      {% endif %}
-      }
-
-- name: Register Twitter Appservice 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_mx_puppet_twitter_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 Twitter bridge but are not using the matrix-nginx-proxy
-      reverse proxy.
-      Please make sure that you're proxying the `{{ matrix_mx_puppet_twitter_redirect_path }}`
-      URL endpoint to the matrix-mx-puppet-twitter container.
-      You can expose the container's port using the `matrix_mx_puppet_twitter_container_http_host_bind_port` variable.
-  when: "not matrix_nginx_proxy_enabled | default(False) | bool"

roles/custom/matrix-bridge-mx-puppet-twitter/tasks/main.yml

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

roles/custom/matrix-bridge-mx-puppet-twitter/tasks/setup_install.yml

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

roles/custom/matrix-bridge-mx-puppet-twitter/tasks/validate_config.yml

@@ -6,7 +6,20 @@
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and vars[item.name] == ''"
   with_items:
+    - {'name': 'matrix_mx_puppet_twitter_hostname', when: true}
+    - {'name': 'matrix_mx_puppet_twitter_path_prefix', when: true}
     - {'name': 'matrix_mx_puppet_twitter_appservice_token', when: true}
     - {'name': 'matrix_mx_puppet_twitter_homeserver_address', when: true}
     - {'name': 'matrix_mx_puppet_twitter_homeserver_token', when: true}
     - {'name': 'matrix_mx_puppet_twitter_database_hostname', when: "{{ matrix_mx_puppet_twitter_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_mx_puppet_twitter_container_network', when: true}
+
+- name: (Deprecation) Catch and report renamed mx-puppet-twitter settings
+  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_mx_puppet_twitter_webhook_path', 'new': '<matrix_mx_puppet_twitter_server_path, but setting matrix_mx_puppet_twitter_path_prefix is better'}
+    - {'old': 'matrix_mx_puppet_twitter_webhook_url', 'new': 'matrix_mx_puppet_twitter_server_url, but controlling matrix_mx_puppet_twitter_scheme/matrix_mx_puppet_twitter_hostname/matrix_mx_puppet_twitter_path_prefix is better'}