From e09d8d1428530590066f15bdcc8e48b3dfc7195c Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Thu, 20 Jun 2024 10:26:16 +0200 Subject: [PATCH 1/9] Bump revision to 40901 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 844c47027..a677bc96b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.9.0" -REVISION="40900" +REVISION="40901" From 30fffdd8eb4dc549d4137f6bb792f1d98ba9fdba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Tue, 2 Jul 2024 09:55:52 +0200 Subject: [PATCH 2/9] Bumped REVISION to 40814 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 32bef1a69..7d4c5c42f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.8.1" -REVISION="40813" +REVISION="40814" From 1704952878f8f70f7e47c4a699a1ebd2ec657f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 4 Jul 2024 14:17:19 -0300 Subject: [PATCH 3/9] Support 4.8.1-rc2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7d4c5c42f..a34afbd87 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.8.1" -REVISION="40814" +REVISION="40815" From 19f18ebb69e3f1eb6baceae5e8962115fab94c36 Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Tue, 9 Jul 2024 11:36:18 +0200 Subject: [PATCH 4/9] Fix AL2023 dependencies bugs --- .../ansible-wazuh-manager/tasks/main.yml | 43 ++++++++++++++----- roles/wazuh/wazuh-indexer/tasks/RedHat.yml | 7 ++- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index b2b852239..d09bc94df 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -1,17 +1,38 @@ --- - name: "Install dependencies" - package: - name: - - unzip - - openssl - - tar - - curl - state: present - register: package_status - until: "package_status is not failed" - retries: 10 - delay: 10 + block: + - name: "Install common dependencies" + package: + name: + - unzip + - openssl + - tar + state: present + register: package_status + until: "package_status is not failed" + retries: 10 + delay: 10 + + - name: "Install curl" + package: + name: curl + state: present + when: ansible_distribution != "Amazon" or (ansible_distribution == "Amazon" and ansible_distribution_version != "2023") + register: package_status + until: "package_status is not failed" + retries: 10 + delay: 10 + + - name: "Install curl minimal in AL2023" + package: + name: curl-minimal + state: present + when: ansible_distribution == "Amazon" and ansible_distribution_version == "2023" + register: package_status + until: "package_status is not failed" + retries: 10 + delay: 10 - include_vars: ../../vars/repo_vars.yml diff --git a/roles/wazuh/wazuh-indexer/tasks/RedHat.yml b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml index d1d0a0608..591752137 100644 --- a/roles/wazuh/wazuh-indexer/tasks/RedHat.yml +++ b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml @@ -12,12 +12,15 @@ - - name: Amazon Linux | Install Amazon extras + - name: Amazon Linux | Configure system settings block: - - name: Install Amazon extras + - name: Install Amazon extras in Amazon Linux 2 yum: name: amazon-linux-extras state: present + when: + - ansible_distribution == 'Amazon' + - ansible_distribution_major_version == '2' - name: Configure vm.max_map_count lineinfile: From d2b5b62bcefe859a497c8b65357b1e039297448f Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Thu, 11 Jul 2024 11:01:13 +0200 Subject: [PATCH 5/9] Change 'install curl' task condition --- roles/wazuh/ansible-wazuh-manager/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index d09bc94df..1614ed84c 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -18,7 +18,7 @@ package: name: curl state: present - when: ansible_distribution != "Amazon" or (ansible_distribution == "Amazon" and ansible_distribution_version != "2023") + when: ansible_distribution != "Amazon" and ansible_distribution_version != "2023" register: package_status until: "package_status is not failed" retries: 10 From c0a6e6cd95ff6cb3434f1188ad148c60b59b5f0a Mon Sep 17 00:00:00 2001 From: Enrique Araque Date: Fri, 12 Jul 2024 09:41:11 +0200 Subject: [PATCH 6/9] Bump revision to 40902 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a677bc96b..73eddbe5a 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.9.0" -REVISION="40901" +REVISION="40902" From 8e164e8e38da13c2a2f3649eb759b31860598b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Mon, 15 Jul 2024 11:09:36 +0200 Subject: [PATCH 7/9] bump revision 40816 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a34afbd87..5f83c1379 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.8.1" -REVISION="40815" +REVISION="40816" From 234e873629af51f78bb97c31a7fafa09c6e029fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Wed, 17 Jul 2024 12:10:01 +0200 Subject: [PATCH 8/9] bump revision to 40817 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5f83c1379..09e36784c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.8.1" -REVISION="40816" +REVISION="40817" From 0b771cbba0a0caaa7a800eb17285f2401ec7fa1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Anguita=20L=C3=B3pez?= Date: Fri, 19 Jul 2024 10:17:33 +0200 Subject: [PATCH 9/9] bump revision to 40903 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 73eddbe5a..b4c9a4fe9 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.9.0" -REVISION="40902" +REVISION="40903"