Move matrix-bridge-appservice-webhooks to its own container network

roles/custom/matrix-bridge-appservice-webhooks/tasks/inject_into_nginx_proxy.yml

@@ -1,46 +0,0 @@
----
-
-- name: Fail if matrix-nginx-proxy role already executed
-  ansible.builtin.fail:
-    msg: >-
-      Trying to append webhooks 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-bridge-appservice-webhooks role.
-  when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-- name: Generate Matrix Appservice webhooks proxying configuration for matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_appservice_webhooks_matrix_nginx_proxy_configuration: |
-      {% if matrix_nginx_proxy_enabled | default(False) %}
-      {# Use the embedded DNS resolver in Docker containers to discover the service #}
-      location ~ ^{{ matrix_appservice_webhooks_public_endpoint }}/(.*)$ {
-        resolver 127.0.0.11 valid=5s;
-        set $backend "matrix-appservice-webhooks:{{ matrix_appservice_webhooks_matrix_port }}";
-        proxy_pass http://$backend/$1;
-      }
-      {% else %}
-      {# Generic configuration for use outside of our container setup #}
-      location {{ matrix_appservice_webhooks_public_endpoint }}/ {
-        proxy_pass http://127.0.0.1:{{ matrix_appservice_webhooks_matrix_port }}/;
-      }
-      {% endif %}
-
-- name: Register webhooks 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_appservice_webhooks_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 webhooks bridge but are not using the matrix-nginx-proxy
-      reverse proxy.
-      Please make sure that you're proxying the `{{ matrix_appservice_webhooks_public_endpoint }}`
-      URL endpoint to the matrix-appservice-webhooks container.
-      You can expose the container's port using the `matrix_appservice_webhooks_container_http_host_bind_port` variable.
-  when: "matrix_appservice_webhooks_enabled | bool and not matrix_nginx_proxy_enabled | default(False) | bool"

roles/custom/matrix-bridge-appservice-webhooks/tasks/main.yml

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

roles/custom/matrix-bridge-appservice-webhooks/tasks/setup_install.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Ensure AppService webhooks paths exist
+- name: Ensure matrix-appservice-webhooks paths exist
   ansible.builtin.file:
     path: "{{ item.path }}"
     state: directory
@@ -14,7 +14,7 @@
     - {path: "{{ matrix_appservice_webhooks_docker_src_files_path }}", when: "{{ matrix_appservice_webhooks_container_image_self_build }}"}
   when: "item.when | bool"
 
-- name: Ensure Appservice webhooks image is pulled
+- name: Ensure matrix-appservice-webhooks container image is pulled
   community.docker.docker_image:
     name: "{{ matrix_appservice_webhooks_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
@@ -28,7 +28,7 @@
 
 - when: "matrix_appservice_webhooks_container_image_self_build | bool"
   block:
-    - name: Ensure Appservice webhooks repository is present on self-build
+    - name: Ensure matrix-appservice-webhooks repository is present on self-build
       ansible.builtin.git:
         repo: "{{ matrix_appservice_webhooks_container_image_self_build_repo }}"
         dest: "{{ matrix_appservice_webhooks_docker_src_files_path }}"
@@ -38,7 +38,7 @@
       become_user: "{{ matrix_user_username }}"
       register: matrix_appservice_webhooks_git_pull_results
 
-    - name: Ensure Appservice webhooks Docker image is built
+    - name: Ensure matrix-appservice-webhooks container image is built
       community.docker.docker_image:
         name: "{{ matrix_appservice_webhooks_docker_image }}"
         source: build
@@ -49,7 +49,7 @@
           path: "{{ matrix_appservice_webhooks_docker_src_files_path }}"
           pull: true
 
-- name: Ensure Matrix Appservice webhooks config is installed
+- name: Ensure matrix-appservice-webhooks config is installed
   ansible.builtin.copy:
     content: "{{ matrix_appservice_webhooks_configuration | to_nice_yaml(indent=2, width=999999) }}"
     dest: "{{ matrix_appservice_webhooks_config_path }}/config.yaml"
@@ -57,7 +57,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
-- name: Ensure Matrix Appservice webhooks schema.yml template exists
+- name: Ensure matrix-appservice-webhooks schema.yml template exists
   ansible.builtin.template:
     src: "{{ role_path }}/templates/schema.yml.j2"
     dest: "{{ matrix_appservice_webhooks_config_path }}/schema.yml"
@@ -65,7 +65,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
-- name: Ensure Matrix Appservice webhooks database.json template exists
+- name: Ensure matrix-appservice-webhooks database.json template exists
   ansible.builtin.template:
     src: "{{ role_path }}/templates/database.json.j2"
     dest: "{{ matrix_appservice_webhooks_data_path }}/database.json"
@@ -81,6 +81,21 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
 
+- name: Ensure matrix-appservice-webhooks container network is created
+  community.general.docker_network:
+    name: "{{ matrix_appservice_webhooks_container_network }}"
+    driver: bridge
+
+- name: Ensure matrix-appservice-webhooks support files installed
+  ansible.builtin.template:
+    src: "{{ role_path }}/templates/{{ item }}.j2"
+    dest: "{{ matrix_appservice_webhooks_base_path }}/{{ item }}"
+    mode: 0640
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - labels
+
 - name: Ensure matrix-appservice-webhooks.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-appservice-webhooks.service.j2"

roles/custom/matrix-bridge-appservice-webhooks/tasks/validate_config.yml

@@ -1,13 +1,16 @@
 ---
 
-- name: Fail if required settings not defined
+- name: Fail if required matrix-appservice-webhooks settings not defined
   ansible.builtin.fail:
     msg: >-
       You need to define a required configuration setting (`{{ item }}`).
   when: "vars[item] == ''"
   with_items:
-    - "matrix_appservice_webhooks_appservice_token"
-    - "matrix_appservice_webhooks_homeserver_url"
-    - "matrix_appservice_webhooks_homeserver_token"
-    - "matrix_appservice_webhooks_id_token"
-    - "matrix_appservice_webhooks_api_secret"
+    - matrix_appservice_webhooks_appservice_token
+    - matrix_appservice_webhooks_homeserver_url
+    - matrix_appservice_webhooks_homeserver_token
+    - matrix_appservice_webhooks_id_token
+    - matrix_appservice_webhooks_api_secret
+    - matrix_appservice_webhooks_container_network
+    - matrix_appservice_webhooks_hostname
+    - matrix_appservice_webhooks_path_prefix