fix!: fixed molecule tests, rewrote how custom variables are handled for hosts overrides; fixed invalid services names for clamav handlers

collections/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
-- name: '[common] merge with custom vars'
-  set_fact:
-    common: "{{ common|combine(custom_common) }}"
+- name: '[setup] merge with custom vars'
+  ansible.builtin.set_fact:
+    common: "{{ common | combine(custom_common, recursive=recursive_combine) }}"
   changed_when: false
 
 - name: '[apt] verify components of default sources'
@@ -11,15 +11,15 @@
         path: '/etc/apt/sources.list'
         regexp: '^(deb((?!{{ item }}).)+)$'
         replace: '\1 {{ item }}'
-      when: not common.deb822_format | bool
-      loop: '{{ common.apt_components }}'
+      when: not common.apt.deb822_format | bool
+      loop: '{{ common.apt.source_components }}'
     - name: '[apt] default deb822 debian.sources'
       ansible.builtin.replace:
         path: '/etc/apt/sources.list.d/debian.sources'
         regexp: '^(Components: ((?!{{ item }}).)+)$'
         replace: '\1 {{ item }}'
-      loop: '{{ common.apt_components }}'
-      when: common.deb822_format | bool
+      loop: '{{ common.apt.source_components }}'
+      when: common.apt.deb822_format | bool
 
 - name: '[apt] install dependencies and tools'
   become: true
@@ -57,14 +57,14 @@
       - yq
     state: present
 
-- name: '[GitHub] install tools'
+- name: '[github] install tools'
   become: true
   nullified.infrastructure.github_artifact:
     asset_name: "{{ item.asset_name | default('') }}"
     asset_type: "{{ item.asset_type }}"
     cmds: "{{ item.cmds | default([]) }}"
     creates: "{{ item.creates | default('') }}"
-    github_token: "{{ custom_github_token }}"
+    github_token: "{{ common.github_token }}"
     repository: "{{ item.repository }}"
     version: "{{ item.version | default('') }}"
   loop:
@@ -110,7 +110,9 @@
     src: ../templates/system/sysctld.local.conf.j2
     dest: /etc/sysctl.d/local.conf
     mode: '0644'
-  when: custom_sysctl is defined
+  when: common.sysctl is truthy
+  vars:
+    sysctl_values: "{{ common.sysctl }}"
   notify:
     - 'common : [system] reload sysctl configuration'
 
@@ -121,7 +123,7 @@
     force_apt_get: true
     cache_valid_time: 3600
     pkg:
-      "{{ common_apt_packages }}"
+      "{{ common.apt.packages }}"
 
 - include_tasks: home_setup.yml