From 2696d5ed8c7643febc28ada668f2bfab47da9c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Marulanda=20Hern=C3=A1ndez?= Date: Fri, 25 Oct 2024 19:38:32 +0000 Subject: [PATCH] Update roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml fix(ansible): Adapt installation of OpenSCAP to support Ubuntu 24.04+ - Updated OpenSCAP installation task to handle differences in package availability between Ubuntu versions. - Ubuntu 24.04+ uses `openscap-scanner` instead of `libopenscap8`. - Conditional logic added to detect Ubuntu version and choose the correct package(s). - Simplified package installation with a loop for clarity. - Adjusted version check commands to handle different package names depending on Ubuntu version. --- .../ansible-wazuh-agent/tasks/Debian.yml | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml index 4d232711..10591bb1 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml @@ -93,30 +93,38 @@ tags: - init -- name: Debian/Ubuntu | Install OpenScap - apt: - name: - - libopenscap8 - - xsltproc - state: present - when: wazuh_agent_config.openscap.disable == 'no' - tags: - - init - register: wazuh_agent_OpenScap_package_install - until: wazuh_agent_OpenScap_package_install is succeeded +- name: Debian/Ubuntu | Install OpenScap + apt: + name: "{{ item }}" + state: present + loop: "{{ openscap_packages }}" + when: wazuh_agent_config.openscap.disable == 'no' + tags: + - init + register: wazuh_agent_OpenScap_package_install + until: wazuh_agent_OpenScap_package_install is succeeded + vars: + openscap_packages: "{{ + (ansible_distribution_version is version('24.04', '>=')) | ternary( + ['openscap-scanner', 'xsltproc'], + ['libopenscap8', 'xsltproc'] + ) + }}" -- name: Debian/Ubuntu | Get OpenScap installed version - shell: "dpkg-query --showformat='${Version}' --show libopenscap8" - register: openscap_version - changed_when: false - when: wazuh_agent_config.openscap.disable == 'no' - tags: +- name: Debian/Ubuntu | Get OpenScap installed version + shell: "dpkg-query --showformat='${Version}' --show {{ openscap_package_name }}" + register: openscap_version + changed_when: false + when: wazuh_agent_config.openscap.disable == 'no' + vars: + openscap_package_name: "{{ (ansible_distribution_version is version('24.04', '>=')) | ternary('openscap-scanner', 'libopenscap8') }}" + tags: - config -- name: Debian/Ubuntu | Check OpenScap version - shell: "dpkg --compare-versions '{{ openscap_version.stdout }}' '>=' '1.2'; echo $?" - register: openscap_version_valid - changed_when: false - when: wazuh_agent_config.openscap.disable == 'no' - tags: +- name: Debian/Ubuntu | Check OpenScap version + shell: "dpkg --compare-versions '{{ openscap_version.stdout }}' '>=' '1.2'; echo $?" + register: openscap_version_valid + changed_when: false + when: wazuh_agent_config.openscap.disable == 'no' + tags: - config