fix: files and templates in nested directories are not placed correctly

Cause: If the user specified a file or template source within a nested
directory, the role was using the whole path and not just the basename
for the name of the destination file.

Consequence: The role was trying to place files and templates in the
same directory structure on the destination, which is not supported
by systemd.

Fix: Ensure the basename of the given file or template is used to
construct the path to the destination.

Result: The role works even when the source files and templates are
in nested directories.

NOTE: If you were relying on the old broken code to make deeply nested
systemd and drop-in directories on the destination, and that somehow
was working, it will no longer be working.

Signed-off-by: Rich Megginson <[email protected]>

Author: richm

examples/foo.service.j2

@@ -1 +1 @@
-../tests/templates/foo.service.j2
+../tests/nested/dir/templates/foo.service.j2

tasks/manage_unit_files.yml

@@ -20,9 +20,9 @@
     - name: Manage files and templates
       when: __systemd_dict_list | length > 0
       vars:
-        __unit: "{{ item.item | regex_replace('[.]j2$', '')
+        __unit: "{{ item.item | basename | regex_replace('[.]j2$', '')
           if __systemd_list_name in ['systemd_unit_file_templates', 'systemd_dropins']
-          else item.item }}"
+          else item.item | basename }}"
         __file: "{{ '99-override.conf' if __systemd_list_name == 'systemd_dropins'
           else __unit }}"
         __path: "{{ item.units_dir ~ '/' ~ '.'.join(__unit.split('.')[:-1]) ~ '.d'

tests/files/bar.service tests/nested/dir/files/bar.servicetests/files/bar.service renamed to tests/nested/dir/files/bar.service

@@ -5,7 +5,7 @@
   gather_facts: false
   vars:
     systemd_unit_file_templates:
-      - foo.service.j2
+      - nested/dir/templates/foo.service.j2
   roles:
     - linux-system-roles.systemd
   tasks:
@@ -18,7 +18,7 @@
   gather_facts: false
   vars:
     systemd_dropins:
-      - foo.service.conf.j2
+      - nested/dir/templates/foo.service.conf.j2
   roles:
     - linux-system-roles.systemd
   tasks:

tests/templates/foo.service.conf.j2 …nested/dir/templates/foo.service.conf.j2tests/templates/foo.service.conf.j2 renamed to tests/nested/dir/templates/foo.service.conf.j2 tests/templates/foo.service.conf.j2 renamed to tests/nested/dir/templates/foo.service.conf.j2

@@ -5,45 +5,50 @@
   gather_facts: false
   vars:
     systemd_fail_if_too_old: false  # allow test to pass on el7
+    __bar_service_name: bar.service
+    __bar_file_src: nested/dir/files/{{ __bar_service_name }}
+    __service_name: foo.service
+    __template_src: nested/dir/templates/{{ __service_name }}.j2
+    __template_conf_src: nested/dir/templates/{{ __service_name }}.conf.j2
     __users:
       - name: systemd_user1
         uid: 5411
       - name: systemd_user2
         uid: 5412
     __all_units:
       - user: "{{ __users[0].name }}"
-        item: bar.service
+        item: "{{ __bar_service_name }}"
       - user: root
-        item: bar.service
+        item: "{{ __bar_service_name }}"
       - user: "{{ __users[1].name }}"
-        item: bar.service
+        item: "{{ __bar_service_name }}"
       - user: "{{ __users[0].name }}"
-        item: foo.service
+        item: "{{ __service_name }}"
       - user: root
-        item: foo.service
+        item: "{{ __service_name }}"
       - user: "{{ __users[1].name }}"
-        item: foo.service
+        item: "{{ __service_name }}"
     __systemd_unit_files:
       - user: "{{ __users[0].name }}"
-        item: bar.service
+        item: "{{ __bar_file_src }}"
       - user: root
-        item: bar.service
+        item: "{{ __bar_file_src }}"
       - user: "{{ __users[1].name }}"
-        item: bar.service
+        item: "{{ __bar_file_src }}"
     __systemd_unit_file_templates:
       - user: "{{ __users[0].name }}"
-        item: foo.service.j2
+        item: "{{ __template_src }}"
       - user: root
-        item: foo.service.j2
+        item: "{{ __template_src }}"
       - user: "{{ __users[1].name }}"
-        item: foo.service.j2
+        item: "{{ __template_src }}"
     __systemd_dropins:
       - user: "{{ __users[0].name }}"
-        item: foo.service.conf.j2
+        item: "{{ __template_conf_src }}"
       - user: root
-        item: foo.service.conf.j2
+        item: "{{ __template_conf_src }}"
       - user: "{{ __users[1].name }}"
-        item: foo.service.conf.j2
+        item: "{{ __template_conf_src }}"
     __systemd_started_units: "{{ __all_units }}"
     __systemd_stopped_units: "{{ __all_units }}"
     __systemd_restarted_units: "{{ __all_units }}"
@@ -86,7 +91,7 @@
 
         - name: Verify files are present
           stat:
-            path: "{{ __units_dir }}/{{ item.item }}"
+            path: "{{ __units_dir }}/{{ item.item | basename }}"
           register: __stat
           failed_when: not __stat.stat.exists
           loop: "{{ __systemd_unit_files }}"
@@ -101,7 +106,7 @@
           loop: "{{ __systemd_unit_file_templates }}"
           vars:
             __units_dir: "{{ __systemd_user_info[item.user]['units_dir'] }}"
-            __dest: "{{ item.item | regex_replace('[.]j2$', '') }}"
+            __dest: "{{ item.item | basename | regex_replace('[.]j2$', '') }}"
 
         - name: Verify dropin files are present
           stat:
@@ -111,7 +116,7 @@
           loop: "{{ __systemd_dropins }}"
           vars:
             __units_dir: "{{ __systemd_user_info[item.user]['units_dir'] }}"
-            __dest: "{{ item.item | regex_replace('[.]j2$', '') }}"
+            __dest: "{{ item.item | basename | regex_replace('[.]j2$', '') }}"
             __path: "{{ __units_dir }}/\
               {{ '.'.join(__dest.split('.')[:-1]) }}.d/\
               99-override.conf"