From 0ff63e3407fea1cfaa7cb1583e6a63d5aac760c3 Mon Sep 17 00:00:00 2001 From: Aine Date: Fri, 13 Feb 2026 10:44:06 +0000 Subject: [PATCH] paths feedback --- roles/custom/matrix-client-fluffychat/defaults/main.yml | 5 +++-- .../matrix-client-fluffychat/tasks/setup_install.yml | 9 +++++---- .../matrix-client-fluffychat/tasks/setup_uninstall.yml | 2 +- .../systemd/matrix-client-fluffychat.service.j2 | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/roles/custom/matrix-client-fluffychat/defaults/main.yml b/roles/custom/matrix-client-fluffychat/defaults/main.yml index a5c828e70..96904059b 100644 --- a/roles/custom/matrix-client-fluffychat/defaults/main.yml +++ b/roles/custom/matrix-client-fluffychat/defaults/main.yml @@ -20,8 +20,9 @@ matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_clien matrix_client_fluffychat_docker_image_registry_prefix_upstream_default: ghcr.io/ matrix_client_fluffychat_docker_image_force_pull: "{{ matrix_client_fluffychat_docker_image.endswith(':latest') }}" -matrix_client_fluffychat_data_path: "{{ matrix_base_data_path }}/client-fluffychat" -matrix_client_fluffychat_container_src_files_path: "{{ matrix_client_fluffychat_data_path }}/docker-src" +matrix_client_fluffychat_base_path: "{{ matrix_base_data_path }}/client-fluffychat" +matrix_client_fluffychat_config_path: "{{ matrix_client_fluffychat_base_path }}/config" +matrix_client_fluffychat_container_src_files_path: "{{ matrix_client_fluffychat_base_path }}/docker-src" # The base container network matrix_client_fluffychat_container_network: '' diff --git a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml index e938e9b95..142279947 100644 --- a/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml +++ b/roles/custom/matrix-client-fluffychat/tasks/setup_install.yml @@ -12,7 +12,8 @@ owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" with_items: - - {path: "{{ matrix_client_fluffychat_data_path }}", when: true} + - {path: "{{ matrix_client_fluffychat_base_path }}", when: true} + - {path: "{{ matrix_client_fluffychat_config_path }}", when: true} - {path: "{{ matrix_client_fluffychat_container_src_files_path }}", when: "{{ matrix_client_fluffychat_container_image_self_build }}"} when: "item.when | bool" @@ -52,13 +53,13 @@ - name: Ensure FluffyChat Web config files installed ansible.builtin.template: src: "{{ item.src }}" - dest: "{{ matrix_client_fluffychat_data_path }}/{{ item.name }}" + dest: "{{ item.dest }}" mode: 0644 owner: "{{ matrix_user_name }}" group: "{{ matrix_group_name }}" with_items: - - {src: "{{ role_path }}/templates/labels.j2", name: "labels"} - - {src: "{{ role_path }}/templates/config.json.j2", name: "config.json"} + - {src: "{{ role_path }}/templates/labels.j2", dest: "{{ matrix_client_fluffychat_base_path }}/labels"} + - {src: "{{ role_path }}/templates/config.json.j2", dest: "{{ matrix_client_fluffychat_config_path }}/config.json"} when: "item.src is not none" - name: Ensure FluffyChat Web container network is created diff --git a/roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml b/roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml index 140c95344..9002ea5d5 100644 --- a/roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml +++ b/roles/custom/matrix-client-fluffychat/tasks/setup_uninstall.yml @@ -25,5 +25,5 @@ - name: Ensure FluffyChat Web path doesn't exist ansible.builtin.file: - path: "{{ matrix_client_fluffychat_data_path }}" + path: "{{ matrix_client_fluffychat_base_path }}" state: absent diff --git a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 index 5f12bbfaa..5ac30839c 100644 --- a/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 +++ b/roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2 @@ -24,8 +24,8 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% if matrix_client_fluffychat_container_http_host_bind_port %} -p {{ matrix_client_fluffychat_container_http_host_bind_port }}:{{ matrix_client_fluffychat_container_http_port }} \ {% endif %} - --label-file={{ matrix_client_fluffychat_data_path }}/labels \ - --mount type=bind,src={{ matrix_client_fluffychat_data_path }}/config.json,dst=/var/public/config.json,ro \ + --label-file={{ matrix_client_fluffychat_base_path }}/labels \ + --mount type=bind,src={{ matrix_client_fluffychat_config_path }}/config.json,dst=/var/public/config.json,ro \ --tmpfs=/tmp:rw,noexec,nosuid,size=10m \ {% for arg in matrix_client_fluffychat_container_extra_arguments %} {{ arg }} \