Merge pull request #55 from arillso/fix/loops

# Improvements to Ansible Roles: Package Conversions and Systemd Unit Options
arillso · Jun 18, 2024 · b40fda4 · b40fda4
2 parents 9ac8097 + 31f9665
commit b40fda4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/roles/maintenance/tasks/maintenance_debian.yml b/roles/maintenance/tasks/maintenance_debian.yml
@@ -8,8 +8,11 @@
   arillso.system.apt_update_info:
   register: register_update
 
-- name: Run arillso Apt Package
+- name: Convert package list and run arillso Apt Package role
   ansible.builtin.include_role:
     name: arillso.system.apt_packages
   vars:
-    apt_packages_list: "{{ register_update.packages }}"
+    apt_packages_list: >-
+      {{
+        register_update.packages | map('dict', {'name': item.package, 'version': item.available}) | list
+      }}
diff --git a/roles/systemd_unit/templates/unit.j2 b/roles/systemd_unit/templates/unit.j2
@@ -11,8 +11,11 @@
 {{ systemd_unit_option }}
 {% endfor %}
 {% endif %}
-{% if systemd_unit_install_options | length %}
+{% if systemd_unit_install_options | length or (systemd_unit_type == 'timer' and 'WantedBy=timers.target' not in systemd_unit_install_options) %}
 [Install]
+{% if systemd_unit_type == 'timer' and 'WantedBy=timers.target' not in systemd_unit_install_options %}
+WantedBy=timers.target
+{% endif %}
 {% for systemd_unit_install_option in systemd_unit_install_options %}
 {{ systemd_unit_install_option }}
 {% endfor %}