Merge pull request #74 from wazuh/PR-47_new_structure

agent and manager grouping task
wazuh · Nov 2, 2018 · 3bed9cb · 3bed9cb
2 parents c9251be + dcd7b1a
commit 3bed9cb
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 58 deletions.
diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
@@ -22,37 +22,28 @@
     cis_distribution_filename: cis_debian_linux_rcl.txt
   when: ansible_os_family == "Debian"
 
-- name: Debian/Ubuntu | Setting webupd8 repository
-  apt_repository:
-    repo: 'ppa:webupd8team/java'
-    codename: 'xenial'
-    update_cache: yes
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
+- when:
+  - wazuh_agent_config.cis_cat.disable == 'no'
+  - wazuh_agent_config.cis_cat.install_java == 'yes'
+  block:
+  - name: Debian/Ubuntu | Setting webupd8 repository
+    apt_repository:
+      repo: 'ppa:webupd8team/java'
+      codename: 'xenial'
+      update_cache: yes
 
-- name: Debian/Ubuntu | Accept Oracle Java 8 license
-  debconf:
-    name: oracle-java8-installer
-    question: shared/accepted-oracle-license-v1-1
-    value: true
-    vtype: boolean
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
+  - name: Debian/Ubuntu | Accept Oracle Java 8 license
+    debconf:
+      name: oracle-java8-installer
+      question: shared/accepted-oracle-license-v1-1
+      value: true
+      vtype: boolean
 
-- name: Debian/Ubuntu | Oracle Java 8 installer
-  apt:
-    name: oracle-java8-installer
-    state: present
-    cache_valid_time: 3600
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
+  - name: Debian/Ubuntu | Oracle Java 8 installer
+    apt:
+      name: oracle-java8-installer
+      state: present
+      cache_valid_time: 3600
   tags:
     - init
 

diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@@ -30,37 +30,28 @@
   set_fact:
     cis_distribution_filename: cis_debian_linux_rcl.txt
 
-- name: Debian/Ubuntu | Setting webupd8 repository
-  apt_repository:
-    repo: 'ppa:webupd8team/java'
-    codename: 'xenial'
-    update_cache: yes
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
+- when:
+   - wazuh_manager_config.cis_cat.disable == 'no'
+   - wazuh_manager_config.cis_cat.install_java == 'yes'
+  block:
+  - name: Debian/Ubuntu | Setting webupd8 repository
+    apt_repository:
+      repo: 'ppa:webupd8team/java'
+      codename: 'xenial'
+      update_cache: yes
 
-- name: Debian/Ubuntu | Accept Oracle Java 8 license
-  debconf:
-    name: oracle-java8-installer
-    question: shared/accepted-oracle-license-v1-1
-    value: true
-    vtype: boolean
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
+  - name: Debian/Ubuntu | Accept Oracle Java 8 license
+    debconf:
+      name: oracle-java8-installer
+      question: shared/accepted-oracle-license-v1-1
+      value: true
+      vtype: boolean
 
-- name: Debian/Ubuntu | Oracle Java 8 installer
-  apt:
-    name: oracle-java8-installer
-    state: present
-    cache_valid_time: 3600
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
+  - name: Debian/Ubuntu | Oracle Java 8 installer
+    apt:
+      name: oracle-java8-installer
+      state: present
+      cache_valid_time: 3600
   tags:
     - init