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

Fix conditionals for Debian families. Split Manager and API install

Browse Source
This commit is contained in:
Jose M 2019-11-21 18:45:45 +01:00
parent 380d4d1430
commit 9e6966b699
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
View File

@ -1,7 +1,7 @@
--- ---
- include_tasks: "installation_from_sources.yml" - include_tasks: "installation_from_sources.yml"
when: when:
- wazuh_manager_sources_installation.enabled - wazuh_manager_sources_installation.enabled or wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Install apt-transport-https and ca-certificates - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
apt: apt:
@ -28,6 +28,7 @@
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14 - ansible_distribution_major_version | int == 14
- not wazuh_manager_sources_installation.enabled - not wazuh_manager_sources_installation.enabled
- not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Installing Wazuh repository key - name: Debian/Ubuntu | Installing Wazuh repository key
apt_key: apt_key:
@ -35,6 +36,7 @@
when: when:
- not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14) - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
- not wazuh_manager_sources_installation.enabled - not wazuh_manager_sources_installation.enabled
- not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Add Wazuh repositories - name: Debian/Ubuntu | Add Wazuh repositories
apt_repository: apt_repository:
@ -45,6 +47,7 @@
changed_when: false changed_when: false
when: when:
- not wazuh_manager_sources_installation.enabled - not wazuh_manager_sources_installation.enabled
- not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Installing NodeJS repository key (Ubuntu 14) - name: Debian/Ubuntu | Installing NodeJS repository key (Ubuntu 14)
become: true become: true
@ -59,13 +62,14 @@
- ansible_distribution == "Ubuntu" - ansible_distribution == "Ubuntu"
- ansible_distribution_major_version | int == 14 - ansible_distribution_major_version | int == 14
- not wazuh_manager_sources_installation.enabled - not wazuh_manager_sources_installation.enabled
- not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Installing NodeJS repository key - name: Debian/Ubuntu | Installing NodeJS repository key
apt_key: apt_key:
url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key url: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
when: when:
- not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14) - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
- not wazuh_manager_sources_installation.enabled - not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Add NodeSource repositories for Node.js - name: Debian/Ubuntu | Add NodeSource repositories for Node.js
apt_repository: apt_repository:
@ -74,7 +78,7 @@
update_cache: true update_cache: true
changed_when: false changed_when: false
when: when:
- not wazuh_manager_sources_installation.enabled - not wazuh_api_sources_installation.enabled
- name: Debian/Ubuntu | Set Distribution CIS filename for Debian/Ubuntu - name: Debian/Ubuntu | Set Distribution CIS filename for Debian/Ubuntu
set_fact: set_fact:
@ -127,11 +131,10 @@
tags: tags:
- config - config
- name: Debian/Ubuntu | Install wazuh-manager, wazuh-api - name: Debian/Ubuntu | Install wazuh-manager
apt: apt:
name: name:
- "wazuh-manager={{ wazuh_manager_version }}" - "wazuh-manager={{ wazuh_manager_version }}"
- "wazuh-api={{ wazuh_manager_version }}"
state: present state: present
cache_valid_time: 3600 cache_valid_time: 3600
install_recommends: false install_recommends: false
@ -140,3 +143,16 @@
tags: init tags: init
when: when:
- not wazuh_manager_sources_installation.enabled - not wazuh_manager_sources_installation.enabled
- name: Debian/Ubuntu | Install wazuh-api
apt:
name:
- "wazuh-api={{ wazuh_manager_version }}"
state: present
cache_valid_time: 3600
install_recommends: false
register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded
tags: init
when:
- not wazuh_api_sources_installation.enabled