Initial work on moving matrix-cactus-comments to its own container network and splitting cactus-client out of it

roles/custom/matrix-cactus-comments/tasks/inject_into_nginx_proxy.yml

@@ -1,44 +0,0 @@
----
-
-- block:
-    - name: Fail if matrix-nginx-proxy role already executed
-      ansible.builtin.fail:
-        msg: >-
-          Trying to append Cactus Comment'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-cactus-comments role.
-      when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-    - name: Mount volume
-      ansible.builtin.set_fact:
-        matrix_nginx_proxy_container_additional_volumes: >
-          {{
-            matrix_nginx_proxy_container_additional_volumes | default([])
-            +
-            [{"src": "{{ matrix_cactus_comments_client_path }}", "dst": "/cactus-comments/cactus-comments", "options": "ro"}]
-          }}
-
-    - name: Generate Cactus Comment proxying configuration for matrix-nginx-proxy
-      ansible.builtin.set_fact:
-        matrix_cactus_comments_nginx_proxy_configuration: |
-          location {{ matrix_cactus_comments_client_endpoint }} {
-              root {{ matrix_cactus_comments_client_nginx_path }};
-          }
-
-    - name: Register Cactus Comment 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_cactus_comments_nginx_proxy_configuration]
-          }}
-
-    - name: Warn about reverse-proxying if matrix-nginx-proxy not used
-      ansible.builtin.debug:
-        msg: >-
-          NOTE: You've enabled Cactus Comments but are not using the matrix-nginx-proxy
-          reverse proxy.
-          Please make sure that you're proxying client files in {{ matrix_cactus_comments_client_path }} correctly
-      when: "not matrix_nginx_proxy_enabled | default(False) | bool"

roles/custom/matrix-cactus-comments/tasks/main.yml

@@ -1,14 +1,5 @@
 ---
 
-- tags:
-    - setup-all
-    - setup-nginx-proxy
-    - install-all
-    - install-nginx-proxy
-  block:
-    - when: matrix_cactus_comments_enabled | bool and matrix_cactus_comments_serve_client_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
-
 - tags:
     - setup-all
     - setup-cactus-comments

roles/custom/matrix-cactus-comments/tasks/setup_install.yml

@@ -9,7 +9,6 @@
     group: "{{ matrix_user_groupname }}"
   with_items:
     - {path: "{{ matrix_cactus_comments_base_path }}", when: true}
-    - {path: "{{ matrix_cactus_comments_client_path }}", when: true}
     - {path: "{{ matrix_cactus_comments_container_tmp_path }}", when: true}
     - {path: "{{ matrix_cactus_comments_docker_src_files_path }}", when: matrix_cactus_comments_container_image_self_build}
   when: "item.when | bool"
@@ -65,40 +64,6 @@
       pull: true
   when: "matrix_cactus_comments_container_image_self_build | bool"
 
-- when: matrix_cactus_comments_client_local_dir | length == 0
-  block:
-    - name: Download web client js
-      ansible.builtin.get_url:
-        url: "{{ matrix_cactus_comments_webclient_js_url }}"
-        dest: "{{ matrix_cactus_comments_client_path }}/cactus.js"
-        mode: "{{ matrix_cactus_comments_client_file_permissions }}"
-        owner: "{{ matrix_user_username }}"
-        group: "{{ matrix_user_groupname }}"
-    - name: Download web client css
-      ansible.builtin.get_url:
-        url: "{{ matrix_cactus_comments_webclient_css_url }}"
-        dest: "{{ matrix_cactus_comments_client_path }}/style.css"
-        mode: "{{ matrix_cactus_comments_client_file_permissions }}"
-        owner: "{{ matrix_user_username }}"
-        group: "{{ matrix_user_groupname }}"
-
-- when: matrix_cactus_comments_client_local_dir | length > 0
-  block:
-    - name: Propagate locally distributed client javascreipt
-      ansible.builtin.copy:
-        src: "{{ matrix_cactus_comments_client_local_dir }}/src/cactus.js"
-        dest: "{{ matrix_cactus_comments_client_path }}/cactus.js"
-        mode: "{{ matrix_cactus_comments_client_file_permissions }}"
-        owner: "{{ matrix_user_username }}"
-        group: "{{ matrix_user_groupname }}"
-    - name: Propagate locally distributed client style.css
-      ansible.builtin.copy:
-        src: "{{ matrix_cactus_comments_client_local_dir }}/src/style.css"
-        dest: "{{ matrix_cactus_comments_client_path }}/style.css"
-        mode: "{{ matrix_cactus_comments_client_file_permissions }}"
-        owner: "{{ matrix_user_username }}"
-        group: "{{ matrix_user_groupname }}"
-
 - name: Ensure matrix-cactus-comments.service installed
   ansible.builtin.template:
     src: "{{ role_path }}/templates/systemd/matrix-cactus-comments.service.j2"

roles/custom/matrix-cactus-comments/tasks/validate_config.yml

@@ -1,15 +1,5 @@
 ---
 
-- name: Fail if required matrix-cactus-comments settings not defined
-  ansible.builtin.fail:
-    msg: >-
-      You need to define a required configuration setting (`{{ item }}`).
-  when: "vars[item] == ''"
-  with_items:
-    - "matrix_cactus_comments_as_token"
-    - "matrix_cactus_comments_hs_token"
-    - "matrix_cactus_comments_homeserver_url"
-
 - name: (Deprecation) Catch and report renamed matrix-cactus-comments settings
   ansible.builtin.fail:
     msg: >-
@@ -19,3 +9,18 @@
   with_items:
     - {'old': 'matrix_bot_cactus_comments_systemd_required_services_list', 'new': 'matrix_cactus_comments_systemd_required_services_list'}
     - {'old': 'matrix_bot_cactus_comments_systemd_wanted_services_list', 'new': 'matrix_cactus_comments_systemd_wanted_services_list'}
+    - {'old': 'matrix_cactus_comments_client_endpoint', 'new': 'matrix_cactus_comments_client_path_prefix'}
+    - {'old': 'matrix_cactus_comments_client_nginx_path', 'new': '<superseded by Traefik labels controlled by matrix_cactus_comments_client_container_labels_traefik_* variables>'}
+    - {'old': 'matrix_cactus_comments_client_path', 'new': 'matrix_cactus_comments_client_base_path'}
+    - {'old': 'matrix_cactus_comments_serve_client_enabled', 'new': 'matrix_cactus_comments_client_enabled'}
+
+- name: Fail if required matrix-cactus-comments settings not defined
+  ansible.builtin.fail:
+    msg: >-
+      You need to define a required configuration setting (`{{ item }}`).
+  when: "vars[item] == ''"
+  with_items:
+    - "matrix_cactus_comments_as_token"
+    - "matrix_cactus_comments_hs_token"
+    - "matrix_cactus_comments_homeserver_url"
+    - "matrix_cactus_comments_container_network"