Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richm merged 1 commit into from
Apr 29, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/foo.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../tests/templates/foo.service.j2
../tests/nested/dir/templates/foo.service.j2
4 changes: 2 additions & 2 deletions tasks/manage_unit_files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
0 tests/files/bar.service → tests/nested/dir/files/bar.service
View file
Open in desktop
File renamed without changes.
0 tests/templates/foo.service.conf.j2 → .../nested/dir/templates/foo.service.conf.j2
View file
Open in desktop
File renamed without changes.
0 tests/templates/foo.service.j2 → tests/nested/dir/templates/foo.service.j2
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/tests_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
41 changes: 23 additions & 18 deletions tests/tests_user_units.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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 }}"
Expand All @@ -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:
Expand All @@ -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"
Expand Down