From a662d661a4f7476068c19fec99ddafbc14aea938 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara
 <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
Date: Sat, 7 Feb 2026 16:44:07 +0900
Subject: [PATCH] Replace `cinny_data_path` with `cinny_base_path`

Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
---
 group_vars/matrix_servers                                   | 2 ++
 roles/custom/matrix-client-cinny/defaults/main.yml          | 4 ++--
 roles/custom/matrix-client-cinny/tasks/setup_install.yml    | 6 +++---
 roles/custom/matrix-client-cinny/tasks/setup_uninstall.yml  | 2 +-
 .../templates/systemd/matrix-client-cinny.service.j2        | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index a24ce4972..451be48d4 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -4315,6 +4315,8 @@ cinny_default_hs_url: "{{ matrix_homeserver_url }}"
 
 cinny_self_check_validate_certificates: "{{ matrix_playbook_ssl_enabled }}"
 
+cinny_base_path: "{{ matrix_base_data_path }}/client-cinny"
+
 ######################################################################
 #
 # /cinny
diff --git a/roles/custom/matrix-client-cinny/defaults/main.yml b/roles/custom/matrix-client-cinny/defaults/main.yml
index 623669b25..c4f80a40a 100644
--- a/roles/custom/matrix-client-cinny/defaults/main.yml
+++ b/roles/custom/matrix-client-cinny/defaults/main.yml
@@ -22,8 +22,8 @@ cinny_container_image: "{{ cinny_container_image_registry_prefix }}ajbura/cinny:
 cinny_container_image_registry_prefix_upstream_default: docker.io/
 cinny_container_image_force_pull: "{{ cinny_container_image.endswith(':latest') }}"
 
-cinny_data_path: "{{ matrix_base_data_path }}/client-cinny"
-cinny_docker_src_files_path: "{{ cinny_data_path }}/docker-src"
+cinny_base_path: "{{ matrix_base_data_path }}/client-cinny"
+cinny_docker_src_files_path: "{{ cinny_base_path }}/docker-src"
 
 # The base container network
 cinny_container_network: ''
diff --git a/roles/custom/matrix-client-cinny/tasks/setup_install.yml b/roles/custom/matrix-client-cinny/tasks/setup_install.yml
index 3cdcd42a3..18249b508 100644
--- a/roles/custom/matrix-client-cinny/tasks/setup_install.yml
+++ b/roles/custom/matrix-client-cinny/tasks/setup_install.yml
@@ -16,7 +16,7 @@
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
   with_items:
-    - {path: "{{ cinny_data_path }}", when: true}
+    - {path: "{{ cinny_base_path }}", when: true}
     - {path: "{{ cinny_docker_src_files_path }}", when: "{{ cinny_container_image_self_build }}"}
   when: "item.when | bool"
 
@@ -46,7 +46,7 @@
 - name: Ensure Cinny configuration installed
   ansible.builtin.copy:
     content: "{{ cinny_configuration | to_nice_json }}"
-    dest: "{{ cinny_data_path }}/config.json"
+    dest: "{{ cinny_base_path }}/config.json"
     mode: 0644
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
@@ -54,7 +54,7 @@
 - name: Ensure Cinny additional config files installed
   ansible.builtin.template:
     src: "{{ item.src }}"
-    dest: "{{ cinny_data_path }}/{{ item.name }}"
+    dest: "{{ cinny_base_path }}/{{ item.name }}"
     mode: 0644
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
diff --git a/roles/custom/matrix-client-cinny/tasks/setup_uninstall.yml b/roles/custom/matrix-client-cinny/tasks/setup_uninstall.yml
index 8492dfbdd..f7233827e 100644
--- a/roles/custom/matrix-client-cinny/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-client-cinny/tasks/setup_uninstall.yml
@@ -27,5 +27,5 @@
 
     - name: Ensure Cinny paths doesn't exist
       ansible.builtin.file:
-        path: "{{ cinny_data_path }}"
+        path: "{{ cinny_base_path }}"
         state: absent
diff --git a/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2 b/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2
index 45258da6f..650cdeb60 100644
--- a/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2
+++ b/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2
@@ -24,10 +24,10 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% if cinny_container_http_host_bind_port %}
 			-p {{ cinny_container_http_host_bind_port }}:8080 \
 			{% endif %}
-			--label-file={{ cinny_data_path }}/labels \
+			--label-file={{ cinny_base_path }}/labels \
 			--tmpfs=/tmp:rw,noexec,nosuid,size=10m \
-			--mount type=bind,src={{ cinny_data_path }}/nginx.conf,dst=/etc/nginx/nginx.conf,ro \
-			--mount type=bind,src={{ cinny_data_path }}/config.json,dst=/app/config.json,ro \
+			--mount type=bind,src={{ cinny_base_path }}/nginx.conf,dst=/etc/nginx/nginx.conf,ro \
+			--mount type=bind,src={{ cinny_base_path }}/config.json,dst=/app/config.json,ro \
 			{% for arg in cinny_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}