Merge pull request #1358 from wazuh/merge-4.9.0-into-4.10.0

Merge 4.9.0 into 4.10.0
wazuh · Jul 19, 2024 · 419c5b4 · 419c5b4
2 parents 4a628ce + 56006ed
commit 419c5b4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git 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" 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
@@ -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: