service: Template file improvements

roles/service/tasks/host_mounts.yaml

@@ -13,28 +13,29 @@
 
 - name: Create service template mount directories
   ansible.builtin.file:
-    path: "{{ _service_host_directory }}/mounts/{{ item }}"
+    path: "{{ item }}"
     state: directory
     mode: "0700"
-  loop: "{{ _service_all_template_mount_directories }}"
+  loop: "{{ _service_all_template_mount_host_files | map('dirname') | unique }}"
 
 - name: Template files for template mounts
   ansible.builtin.template:
-    src: "{{ item[0].source }}"
-    dest: "{{ item[1] }}"
-    mode: "{{ item[0].mode | default('0644') }}"
-    validate: "{{ validate if item[0].template_validate_command is defined else omit }}"
+    src: "{{ item.source }}"
+    dest: "{{ item.hostfile }}"
+    mode: "{{ item.mode | default('0644') }}"
+    validate: "{{ validate if item.template_validate_command is defined else omit }}"
   notify: >-
     {{ 'Reload' if service_container_reload_method != 'none' else 'Restart' }}
     container service {{ service_name }}
-  loop: "{{ _service_all_template_mounts | zip(_service_all_template_mount_host_files) }}"
+  loop: "{{ _service_all_template_mounts_full }}"
   vars:
-    validate: >-
-      podman run --rm
-      -v %s:{{ item[0].destination }}:ro
-      --entrypoint {{ item[0].template_validate_command.split(' ', 1)[0] }}
-      {{ service_container_image }}
-      {{ item[0].template_validate_command.split(' ', 1)[1] }}
+    validate: "{{ _service_template_validate_command }}"
+
+- name: Ensure no legacy templated files present
+  ansible.builtin.file:
+    path: "{{ _service_host_directory }}/mounts/{{ item.source | regex_replace('\\.j2$', '') }}"
+    state: absent
+  loop: "{{ _service_all_template_mounts_full }}"
 
 - name: Copy files for copy mounts
   ansible.builtin.copy: