afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #229 from wazuh/fix-228

Browse Source 
Fix conditionals for Amazon Linux in Manager and Filebeat
This commit is contained in:
Manuel J. Bernal 2019-09-05 14:22:26 +02:00 committed by GitHub
commit 29df9c1269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/wazuh/ansible-filebeat/tasks/main.yml
View File

@ -10,7 +10,7 @@
register: filebeat_installing_package register: filebeat_installing_package
until: filebeat_installing_package is succeeded until: filebeat_installing_package is succeeded
when: when:
- ansible_distribution in ['CentOS','RedHat'] - ansible_distribution in ['CentOS','RedHat', 'Amazon']
tags: tags:
- install - install
@ -22,7 +22,7 @@
register: filebeat_installing_package_debian register: filebeat_installing_package_debian
until: filebeat_installing_package_debian is succeeded until: filebeat_installing_package_debian is succeeded
when: when:
- not (ansible_distribution in ['CentOS','RedHat']) - not (ansible_distribution in ['CentOS','RedHat', 'Amazon'])
tags: tags:
- init - init

24
roles/wazuh/ansible-wazuh-manager/tasks/main.yml
View File

@ -5,7 +5,7 @@
- import_tasks: "Debian.yml" - import_tasks: "Debian.yml"
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
- name: CentOS/RedHat | Install wazuh-manager, wazuh-api - name: CentOS/RedHat/Amazon | Install wazuh-manager, wazuh-api
package: pkg={{ item }}-{{ wazuh_manager_api_version }}-1 state={{ wazuh_manager_package_state }} package: pkg={{ item }}-{{ wazuh_manager_api_version }}-1 state={{ wazuh_manager_package_state }}
with_items: with_items:
- wazuh-manager - wazuh-manager
@ -13,7 +13,7 @@
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- ansible_distribution in ['CentOS','RedHat'] - ansible_distribution in ['CentOS','RedHat', 'Amazon']
tags: tags:
- init - init
@ -28,13 +28,13 @@
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- not (ansible_distribution in ['CentOS','RedHat']) - not (ansible_distribution in ['CentOS','RedHat', 'Amazon'])
tags: init tags: init
- name: Install expect - name: Install expect
package: pkg=expect state={{ wazuh_manager_package_state }} package: pkg=expect state={{ wazuh_manager_package_state }}
when: when:
- not (ansible_distribution in ['CentOS','RedHat'] and ansible_distribution_major_version|int < 6) - not (ansible_distribution in ['CentOS','RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6)
tags: init tags: init
- name: CentOS/RedHat 6 | Enabling python2.7 and sqlite3 - name: CentOS/RedHat 6 | Enabling python2.7 and sqlite3
@ -43,7 +43,7 @@
regexp: 'echo -n "Starting Wazuh-manager: "' regexp: 'echo -n "Starting Wazuh-manager: "'
replace: 'echo -n "Starting Wazuh-manager (EL6): "; source /opt/rh/python27/enable; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/var/ossec/framework/lib' replace: 'echo -n "Starting Wazuh-manager (EL6): "; source /opt/rh/python27/enable; export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/var/ossec/framework/lib'
when: when:
- ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int == 6 - ansible_distribution in ['CentOS', 'RedHat', 'Amazon'] and ansible_distribution_major_version|int == 6
- wazuh_manager_config.cluster.disable != 'yes' - wazuh_manager_config.cluster.disable != 'yes'
- name: Install wazuh-manager and expect (EL5) - name: Install wazuh-manager and expect (EL5)
@ -54,7 +54,7 @@
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- ansible_distribution in ['CentOS','RedHat'] and ansible_distribution_major_version|int < 6 - ansible_distribution in ['CentOS','RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6
tags: tags:
- init - init
@ -203,7 +203,7 @@
- name: Retrieving Wazuh-API User Credentials - name: Retrieving Wazuh-API User Credentials
include_vars: wazuh_api_creds.yml include_vars: wazuh_api_creds.yml
when: when:
- not (ansible_distribution in ['CentOS','RedHat'] and ansible_distribution_major_version|int < 6) - not (ansible_distribution in ['CentOS','RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6)
tags: tags:
- config - config
@ -281,7 +281,7 @@
poll: 0 poll: 0
when: when:
- wazuh_manager_config.vuls.disable != 'yes' - wazuh_manager_config.vuls.disable != 'yes'
- ansible_distribution in ['Redhat', 'CentOS', 'Ubuntu', 'Debian', 'Oracle'] - ansible_distribution in ['Redhat', 'CentOS', 'Ubuntu', 'Debian', 'Oracle', 'Amazon']
tags: tags:
- init - init
@ -322,7 +322,7 @@
notify: restart wazuh-api notify: restart wazuh-api
when: when:
- wazuh_api_user is defined - wazuh_api_user is defined
- not (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' and ansible_distribution_major_version|int < 6) - not (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' or ansible_distribution == 'Amazon' and ansible_distribution_major_version|int < 6)
tags: tags:
- config - config
@ -378,7 +378,7 @@
environment: environment:
LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:/var/ossec/framework/lib" LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:/var/ossec/framework/lib"
when: when:
- not (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' and ansible_distribution_major_version|int < 6) - not (ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' or ansible_distribution == 'Amazon' and ansible_distribution_major_version|int < 6)
- name: Ensure Wazuh Manager is started and enabled (EL5) - name: Ensure Wazuh Manager is started and enabled (EL5)
service: service:
@ -388,10 +388,10 @@
tags: tags:
- config - config
when: when:
- ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int < 6 - ansible_distribution in ['CentOS', 'RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6
- import_tasks: "RMRedHat.yml" - import_tasks: "RMRedHat.yml"
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat" or ansible_os_family == "Amazon"
- import_tasks: "RMDebian.yml" - import_tasks: "RMDebian.yml"
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"