ansible-lint cleanups

roles/ensure_ansible_prereq/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include vendor / version specific tasks'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_tasks:
+  ansible.builtin.include_tasks:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
   vars:
     findme:
       files:
@@ -13,14 +13,14 @@
         - '{{ ansible_facts["distribution"] }}-default.yml'
         - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
         - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
-        - '{{ ansible_facts["os_family"]}}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-default.yml'
         - 'default.yml'
       errors: 'ignore'
 - name: 'include vendor / version specific variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_ansible_prereq'
   vars:
     findme:
@@ -102,6 +102,5 @@
     - 'ensure_ansible_prereq.package_facts'
     - 'ensure_ansible_prereq.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_apache/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_apache'
   vars:
     findme:
@@ -172,6 +172,9 @@
   ansible.builtin.file:
     path: '/srv/http/{{ item.fqdn }}'
     state: 'directory'
+    owner: 'apache'
+    group: 'apache'
+    mode: '0755'
     setype: 'httpd_sys_content_t'
   loop: '{{ http_vhost }}'
   loop_control:
@@ -220,6 +223,5 @@
     - 'ensure_apache.service_reload'
     - 'ensure_apache.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_clamav/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_system == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_clamav'
   vars:
     findme:
@@ -93,6 +93,9 @@
   ansible.builtin.file:
     path: '{{ quarantine_directory }}'
     state: 'directory'
+    owner: 'clamav'
+    group: 'clamav'
+    mode: '0750'
 - name: 'ensure configurations'
   when:
     - ansible_system == 'Linux'
@@ -149,23 +152,22 @@
       - '^tmp.([0-9]|[a-f}){10}$'
     recurse: 'yes'
     use_regex: 'yes'
-  register: 'results'
+  register: 'ensure_clamav_results'
 - name: 'And drop them'
   when:
     - ansible_system == 'Linux'
     - ensure_clamav is defined
     - freshclam_retention is defined
     - freshclam_retention is regex('^[0-9]*[smhdw]$')
-    - results is defined
+    - ensure_clamav_results is defined
-    - results.files is defined
+    - ensure_clamav_results.files is defined
-    - results.files is iterable
+    - ensure_clamav_results.files is iterable
   ansible.builtin.file:
     path: '{{ item.path }}'
     state: 'absent'
-  loop: '{{ results.files }}'
+  loop: '{{ ensure_clamav_results.files }}'
   loop_control:
     label: '{{ item.path }} to be removed'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_cockpit/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_cockpit'
   vars:
     findme:
@@ -86,6 +86,6 @@
     - 'ensure_cockpit.package_facts'
     - 'ensure_cockpit.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_dovecot/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_dovecot'
   vars:
     findme:
@@ -147,6 +147,6 @@
     - 'ensure_dovecot.package_facts'
     - 'ensure_dovecot.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_git/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_git'
   vars:
     findme:
@@ -129,6 +129,6 @@
     - 'ensure_git.service_reload'
     - 'ensure_git.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_gitea/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_gitea'
   vars:
     findme:
@@ -212,6 +212,6 @@
     - 'ensure_gitea.service_reload'
     - 'ensure_gitea.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_log_rotation/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_log_rotation'
   vars:
     findme:
@@ -90,5 +90,5 @@
     - 'ensure_log_rotation.package_facts'
     - 'ensure_log_rotation.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 

roles/ensure_mariadb/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_mariadb'
   vars:
     findme:
@@ -149,7 +149,7 @@
     - 'ensure_mariadb.service_reload'
     - 'ensure_mariadb.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 - name: 'ensure mariadb databases'
   when:
     - mariadb_db_list is defined

roles/ensure_os_patch/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_os_patch'
   vars:
     findme:
@@ -82,6 +82,6 @@
     - 'ensure_os_patch.package_facts'
     - 'ensure_os_patch.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_os_upgrade/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_os_upgrade'
   vars:
     findme:
@@ -80,8 +80,8 @@
     - ensure_os_upgrade.package_list is iterable
     - ensure_os_upgrade.target_version is defined
     - ansible_facts["distribution_major_version"]|int < ensure_os_upgrade.target_version|int
-  async: '1'
+  async: 1
-  poll: '0'
+  poll: 0
   ansible.builtin.shell: >
     sleep 5 && dnf -y system-upgrade reboot
 - name: 'Wait for the reboot'
@@ -109,6 +109,5 @@
     - 'ensure_os_upgrade.package_facts'
     - 'ensure_os_upgrade.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_podman/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_podman'
   vars:
     findme:
@@ -68,7 +68,7 @@
     - ansible_facts["distribution_major_version"] is version('32', '>=')
     - ansible_cmdline is defined
     - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
-  shell:
+  ansible.builtin.shell:
     cmd: |
       grubby --update-kernel=ALL --remove-args=systemd.unified_cgroup_hierarchy=0
 - name: 'Reboot to disable cgroups v1'
@@ -79,8 +79,7 @@
     - ansible_facts["distribution_major_version"] is version('32', '>=')
     - ansible_cmdline is defined
     - ansible_cmdline['systemd.unified_cgroup_hierarchy'] is defined
-  reboot:
+  ansible.builtin.reboot:
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_postfix/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_postfix'
   vars:
     findme:
@@ -147,6 +147,6 @@
     - 'ensure_postfix.package_facts'
     - 'ensure_postfix.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_repo_epel/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_repo_epel'
   vars:
     findme:
@@ -63,6 +63,6 @@
     - 'ensure_repo_epel.package_facts'
     - 'ensure_repo_epel.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_repo_fdragon/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_system == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_repo_fdragon'
   vars:
     findme:
@@ -46,6 +46,12 @@
   notify:
     - 'ensure_repo_fdragon.package_facts'
     - 'ensure_repo_fdragon.service_facts'
+- name: 'ensure services'
+  when:
+    - ansible_facts["system"] == 'Linux'
+    - ensure_repo_fdragon is defined
+    - ensure_repo_fdragon.service_list is defined
+    - ensure_repo_fdragon.service_list is iterable
   ansible.builtin.service:
     enabled: '{{ item.enabled }}'
     name: '{{ item.name }}'
@@ -57,6 +63,6 @@
     - 'ensure_repo_fdragon.package_facts'
     - 'ensure_repo_fdragon.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_repo_rpmfusion/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_repo_rpmfusion'
   vars:
     findme:
@@ -63,6 +63,6 @@
     - 'ensure_repo_rpmfusion.package_facts'
     - 'ensure_repo_rpmfusion.service_facts'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
 

roles/ensure_rsync/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_rsync'
   vars:
     findme:
@@ -94,7 +94,7 @@
   ansible.posix.selinux:
     policy: '{{ ensure_rsync.selinux_policy }}'
     state: '{{ ensure_rsync.selinux_state }}'
-  register: 'results'
+  register: 'ensure_rsync_results'
   notify:
     - 'ensure_rsync.package_facts'
     - 'ensure_rsync.service_facts'
@@ -105,11 +105,11 @@
     - ansible_facts["system"] == 'Linux'
     - ensure_rsync is defined
     - ensure_rsync.selinux_policy is defined
-    - ensure_rsync.selinux_state is defined
+    - ensure_rsync.selinux_state is defined # This line is correct, no change needed
-    - results is defined
+    - ensure_rsync_results is defined
-    - results.reboot_required is defined
+    - ensure_rsync_results.reboot_required is defined
-    - results.reboot_required
+    - ensure_rsync_results.reboot_required
-  reboot:
+  ansible.builtin.reboot:
 - name: 'ensure seboolean'
   when:
     - ansible_facts["system"] == 'Linux'
@@ -129,6 +129,5 @@
     - 'ensure_rsync.service_reload'
     - 'ensure_rsync.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_selinux/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_selinux'
   vars:
     findme:
@@ -94,17 +94,17 @@
   ansible.posix.selinux:
     policy: '{{ ensure_selinux.selinux_policy }}'
     state: '{{ ensure_selinux.selinux_state }}'
-  register: 'results'
+  register: 'ensure_selinux_results'
 - name: 'Reboot if required'
   when:
     - ansible_facts["system"] == 'Linux'
     - ensure_selinux is defined
     - ensure_selinux.selinux_policy is defined
     - ensure_selinux.selinux_state is defined
-    - results is defined
+    - ensure_selinux_results is defined
-    - results.reboot_required is defined
+    - ensure_selinux_results.reboot_required is defined
-    - results.reboot_required
+    - ensure_selinux_results.reboot_required
-  reboot:
+  ansible.builtin.reboot:
 - name: 'ensure seboolean'
   when:
     - ansible_facts["system"] == 'Linux'
@@ -119,6 +119,5 @@
   loop_control:
     label: '{{ item.name }} will be {{ item.state }}'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_sudo/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include vendor / version specific variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_sudo'
   vars:
     findme:
@@ -98,7 +98,7 @@
     paths:
       - '/var/log/sudo-io/'
     recurse: 'yes'
-  register: 'results'
+  register: 'ensure_sudo_results'
 - name: 'And drop them'
   when:
     - ansible_facts["system"] == 'Linux'
@@ -109,10 +109,9 @@
   ansible.builtin.file:
     path: '{{ item.path }}'
     state: 'absent'
-  loop: '{{ results.files }}'
+  loop: '{{ ensure_sudo_results.files }}'
   loop_control:
     label: '{{ item.path }} to be removed'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_timezone/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_timezone'
   vars:
     findme:
@@ -102,17 +102,17 @@
   ansible.posix.selinux:
     policy: '{{ ensure_timezone.selinux_policy }}'
     state: '{{ ensure_timezone.selinux_state }}'
-  register: 'results'
+  register: 'ensure_timezone_results'
 - name: 'Reboot if required'
   when:
     - ansible_facts["system"] == 'Linux'
     - ensure_timezone is defined
     - ensure_timezone.selinux_policy is defined
     - ensure_timezone.selinux_state is defined
-    - results is defined
+    - ensure_timezone_results is defined
-    - results.reboot_required is defined
+    - ensure_timezone_results.reboot_required is defined
-    - results.reboot_required
+    - ensure_timezone_results.reboot_required
-  reboot:
+  ansible.builtin.reboot:
 - name: 'ensure seboolean'
   when:
     - ansible_facts["system"] == 'Linux'
@@ -127,6 +127,5 @@
   loop_control:
     label: '{{ item.name }} will be {{ item.state }}'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-

roles/ensure_vim/tasks/main.yml

@@ -3,8 +3,8 @@
 - name: 'include variables'
   when:
     - ansible_facts["system"] == 'Linux'
-  include_vars:
+  ansible.builtin.include_vars:
-    file: '{{ lookup("first_found", findme ) }}'
+    file: '{{ lookup("first_found", findme) }}'
     name: 'ensure_vim'
   vars:
     findme:
@@ -94,7 +94,7 @@
   ansible.posix.selinux:
     policy: '{{ ensure_vim.selinux_policy }}'
     state: '{{ ensure_vim.selinux_state }}'
-  register: 'results'
+  register: 'ensure_vim_results'
   notify:
     - 'ensure_vim.package_facts'
     - 'ensure_vim.service_facts'
@@ -106,10 +106,10 @@
     - ensure_vim is defined
     - ensure_vim.selinux_policy is defined
     - ensure_vim.selinux_state is defined
-    - results is defined
+    - ensure_vim_results is defined
-    - results.reboot_required is defined
+    - ensure_vim_results.reboot_required is defined
-    - results.reboot_required
+    - ensure_vim_results.reboot_required
-  reboot:
+  ansible.builtin.reboot:
 - name: 'ensure seboolean'
   when:
     - ansible_facts["system"] == 'Linux'
@@ -129,6 +129,5 @@
     - 'ensure_vim.service_reload'
     - 'ensure_vim.service_restart'
 - name: 'flush handlers'
-  meta: 'flush_handlers'
+  ansible.builtin.meta: 'flush_handlers'
 ...
-