Skip to content

Commit

Permalink
Merge pull request #1353 from wazuh/maintenance/1348-revert-merge-4.9…
Browse files Browse the repository at this point in the history
….0-into-master

Revert "Merge branch '4.8.1' into merge-4.8.1-into-4.9.0"
  • Loading branch information
davidcr01 authored Jul 19, 2024
2 parents 2c5f6c0 + 713e2b5 commit 4e2e7db
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 37 deletions.
43 changes: 11 additions & 32 deletions roles/wazuh/ansible-wazuh-manager/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 2 additions & 5 deletions roles/wazuh/wazuh-indexer/tasks/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4e2e7db

Please sign in to comment.