From 713e2b5152fbd94721a990edeeb6107f707590e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= <david.correa@wazuh.com>
Date: Fri, 19 Jul 2024 09:40:17 +0200
Subject: [PATCH] Revert "Merge branch '4.8.1' into merge-4.8.1-into-4.9.0"

This reverts commit 7b21e25c48fd1363bf6b58dbcc18b460650ac7e1, reversing
changes made to 93f88d2e1ff4ef22ad9b83247ff6ea8eecabcb45.
---
 .../ansible-wazuh-manager/tasks/main.yml      | 43 +++++--------------
 roles/wazuh/wazuh-indexer/tasks/RedHat.yml    |  7 +--
 2 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
index 1614ed84..b2b85223 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@@ -1,38 +1,17 @@
 ---
 
 - name: "Install dependencies"
-  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" 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
+  package:
+    name:
+      - unzip
+      - openssl
+      - tar
+      - curl
+    state: present
+  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 59175213..d1d0a060 100644
--- a/roles/wazuh/wazuh-indexer/tasks/RedHat.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml
@@ -12,15 +12,12 @@
 
 
 
-  - name: Amazon Linux | Configure system settings
+  - name: Amazon Linux | Install Amazon extras
     block:
-      - name: Install Amazon extras in Amazon Linux 2
+      - name: Install Amazon extras
         yum:
           name: amazon-linux-extras
           state: present
-        when: 
-          - ansible_distribution == 'Amazon'
-          - ansible_distribution_major_version == '2'
 
       - name: Configure vm.max_map_count
         lineinfile: