From 53914e9637d3793f47c92115947ba21cc5b01204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Marulanda=20Hern=C3=A1ndez?= Date: Mon, 28 Oct 2024 20:11:24 +0000 Subject: [PATCH] Update roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml --- .../ansible-wazuh-manager/tasks/Debian.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index 347d520..401f594 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -81,31 +81,36 @@ tags: - init -- name: Debian/Ubuntu | Install OpenScap +- name: Debian/Ubuntu | Install OpenSCAP apt: name: - - libopenscap8 + - "{{ 'openscap-scanner' if ansible_distribution_version >= '24.04' else 'libopenscap8' }}" - xsltproc state: present cache_valid_time: 3600 + update_cache: yes install_recommends: false register: wazuh_manager_openscap_installed until: wazuh_manager_openscap_installed is succeeded + retries: 3 + delay: 10 when: wazuh_manager_config.openscap.disable == 'no' tags: - init -- name: Debian/Ubuntu | Get OpenScap installed version - shell: "dpkg-query --showformat='${Version}' --show libopenscap8" +- name: Debian/Ubuntu | Get OpenSCAP installed version + shell: "dpkg-query --showformat='${Version}' --show {{ 'openscap-scanner' if ansible_distribution_version >= '24.04' else 'libopenscap8' }}" when: wazuh_manager_config.openscap.disable == 'no' register: openscap_version changed_when: false tags: - config -- name: Debian/Ubuntu | Check OpenScap version +- name: Debian/Ubuntu | Check if OpenSCAP version is >= 1.2 shell: "dpkg --compare-versions '{{ openscap_version.stdout }}' '>=' '1.2'; echo $?" - when: wazuh_manager_config.openscap.disable == 'no' + when: + - wazuh_manager_config.openscap.disable == 'no' + - openscap_version.stdout != "Not Installed" register: openscap_version_valid changed_when: false tags: @@ -123,3 +128,4 @@ - include_tasks: "installation_from_custom_packages.yml" when: - wazuh_custom_packages_installation_manager_enabled +