CI. Fuck.

3 files changed, 12 insertions, 3 deletions

diff --git a/tasks/copy-rendered-templates-recursive.yml b/tasks/copy-rendered-templates-recursive.yml
index 2b83834..3b6055a 100644
--- a/tasks/copy-rendered-templates-recursive.yml
+++ b/tasks/copy-rendered-templates-recursive.yml
@@ -14,6 +14,7 @@
     path: "{{ tempdir.path }}/{{ item.path | dirname }}"
     state: directory
     mode: "{{ mode | default('0755') }}"
+    owner: "{{ owner }}"
   with_filetree: "{{ render_dir }}"
   when: item.state == "file"
 
@@ -55,6 +56,7 @@
     src: "{{ item.src }}"
     dest: "{{ tempdir.path }}/{{ item.path }}"
     mode: "{{ mode | default('0755') }}"
+    owner: "{{ owner }}"
   loop: "{{ text_files }}"
 
 - name: Copy binary files directly
@@ -64,6 +66,7 @@
     src: "{{ item.src }}"
     dest: "{{ tempdir.path }}/{{ item.path }}"
     mode: "{{ mode | default('0644') }}"
+    owner: "{{ owner }}"
   loop: "{{ binary_files }}"
 
 - name: Sync rendered and copied files to remote host
@@ -72,16 +75,19 @@
   ansible.builtin.synchronize:
     src: "{{ tempdir.path }}/"
     dest: "{{ tempdir.path }}/"
+    owner: true
+    group: true
     recursive: true
 
 - name: Ensure destination exists
   ansible.builtin.file:
     path: "{{ destination_dir }}"
+    owner: "{{ owner }}"
     state: directory
 
-- name: Copy files to final destination
+- name: Copy files to final destination, preserving ownership stuff
   ansible.builtin.command:
-    cmd: bash -c 'cp -r {{ tempdir.path }}/* {{ destination_dir }}/'
+    cmd: bash -c 'cp -rp {{ tempdir.path }}/* {{ destination_dir }}/'
 
 - name: Remove local temporary directory
   delegate_to: localhost
diff --git a/tasks/manage-docker-compose-service.yml b/tasks/manage-docker-compose-service.yml
index 1910b0f..d53bc94 100644
--- a/tasks/manage-docker-compose-service.yml
+++ b/tasks/manage-docker-compose-service.yml
@@ -3,6 +3,8 @@
 - name: "Copy rendered templates for {{ service_name }}"
   ansible.builtin.import_tasks: copy-rendered-templates-recursive.yml
   vars:
+    owner: "{{ service_owner | default('1000') }}"
+    mode: "{{ file_mode | default('777') }}"
     render_dir: "{{ template_render_dir }}"
     destination_dir: "{{ service_destination_dir }}"
 
diff --git a/tasks/manage-docker-swarm-service.yml b/tasks/manage-docker-swarm-service.yml
index 3d01e1c..811ec8b 100644
--- a/tasks/manage-docker-swarm-service.yml
+++ b/tasks/manage-docker-swarm-service.yml
@@ -3,7 +3,8 @@
 - name: "Copy rendered templates for {{ service_name }}"
   ansible.builtin.import_tasks: copy-rendered-templates-recursive.yml
   vars:
-    mode: "0777"
+    owner: "{{ service_owner | default('1000') }}"
+    mode: "{{ file_mode | default('777') }}"
     render_dir: "{{ template_render_dir }}"
     destination_dir: "{{ service_destination_dir }}"