Merge pull request #173 from wazuh/3.9-issue_172-fix

Changing from Oracle JDK to OpenJDK
2019-04-30 17:10:34 +02:00 · 2019-04-30 17:10:34 +02:00 · 6034857b66
commit 6034857b66
parent 2d3ca9a455 cd3fcc7857
7 changed files with 32 additions and 113 deletions
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@ -6,24 +6,8 @@

 - when: elasticsearch_install_java
  block:
-    - name: Debian/Ubuntu | Setting webupd8 repository
-      apt_repository:
-        repo: 'ppa:webupd8team/java'
-        codename: 'xenial'
-        update_cache: true
-
-    - 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
+    - name: Debian/Ubuntu | Install OpenJDK 1.8
+      apt: name=openjdk-8-jre state=present cache_valid_time=3600
      tags: install

 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
@ -1,16 +1,8 @@
 ---
 - when: elasticsearch_install_java
  block:
-    - name: RedHat/CentOS/Fedora | download Oracle Java RPM
-      get_url:
-        url: https://download.oracle.com/otn-pub/java/jdk/8u202-b08/1961070e4c9b4e26a04e7f5a083f551e/jre-8u202-linux-x64.rpm
-        dest: /tmp/jre-8-linux-x64.rpm
-        headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
-      register: oracle_java_task_rpm_download
-
-    - name: RedHat/CentOS/Fedora | Install Oracle Java RPM
-      package: name=/tmp/jre-8-linux-x64.rpm state=present
-      when: oracle_java_task_rpm_download is defined
+    - name: RedHat/CentOS/Fedora | Install OpenJDK 1.8
+      yum: name=java-1.8.0-openjdk state=present
      register: oracle_java_task_rpm_installed
      tags: install

--- a/roles/elastic-stack/ansible-logstash/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-logstash/tasks/Debian.yml
@ -6,23 +6,8 @@

 - when: logstash_install_java
  block:
-    - name: Debian/Ubuntu | Setting webupd8 repository
-      apt_repository:
-        repo: 'ppa:webupd8team/java'
-        codename: 'xenial'
-
-    - 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
+    - name: Debian/Ubuntu | Install OpenJDK 1.8
+      apt: name=openjdk-8-jre state=present cache_valid_time=3600
      tags: install

 - name: Debian/Ubuntu | Add Elasticsearch GPG key
--- a/roles/elastic-stack/ansible-logstash/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-logstash/tasks/RedHat.yml
@ -1,16 +1,8 @@
 ---
 - when: logstash_install_java
  block:
-    - name: RedHat/CentOS/Fedora | download Oracle Java RPM
-      get_url:
-        url: https://download.oracle.com/otn-pub/java/jdk/8u202-b08/1961070e4c9b4e26a04e7f5a083f551e/jre-8u202-linux-x64.rpm
-        dest: /tmp/jre-8-linux-x64.rpm
-        headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
-      register: oracle_java_task_rpm_download
-
-    - name: RedHat/CentOS/Fedora | Install Oracle Java RPM
-      package: name=/tmp/jre-8-linux-x64.rpm state=present
-      when: oracle_java_task_rpm_download is defined
+    - name: RedHat/CentOS/Fedora | Install OpenJDK 1.8
+      yum: name=java-1.8.0-openjdk state=present
      register: oracle_java_task_rpm_installed
      tags: install

--- a/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
@ -37,28 +37,20 @@
    cis_distribution_filename: cis_debian_linux_rcl.txt
  when: ansible_os_family == "Debian"

- block:
-    - name: Debian/Ubuntu | Setting webupd8 repository
-      apt_repository:
-        repo: 'ppa:webupd8team/java'
-        codename: 'xenial'
-        update_cache: true
-
-    - 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
+- name: Debian/Ubuntu | Install OpenJDK-8 repo
+  apt_repository:
+    repo: 'ppa:openjdk-r/ppa'
+    state: present
+    update_cache: true
  when:
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
+
+- when:
    - wazuh_agent_config.cis_cat.disable == 'no'
    - wazuh_agent_config.cis_cat.install_java == 'yes'
+  block:
+    - name: Debian/Ubuntu | Install OpenJDK 1.8
+      apt: name=openjdk-8-jre state=present cache_valid_time=3600
  tags:
    - init

--- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@ -64,30 +64,20 @@
  set_fact:
    cis_distribution_filename: cis_debian_linux_rcl.txt

- block:
-    - name: Debian/Ubuntu | Setting webupd8 repository
-      apt_repository:
-        repo: 'ppa:webupd8team/java'
-        codename: 'xenial'
-        update_cache: true
-
-    - 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
-      register: wazuh_manager_oracle_java_8_installed
-      until: wazuh_manager_oracle_java_8_installed is succeeded
+- name: Debian/Ubuntu | Install OpenJDK-8 repo
+  apt_repository:
+    repo: 'ppa:openjdk-r/ppa'
+    state: present
+    update_cache: true
  when:
+    - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int == 14)
+
+- when:
    - wazuh_manager_config.cis_cat.disable == 'no'
    - wazuh_manager_config.cis_cat.install_java == 'yes'
+  block:
+    - name: Debian/Ubuntu | Install OpenJDK 1.8
+      apt: name=openjdk-8-jre state=present cache_valid_time=3600
  tags:
    - init

--- a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
@ -114,30 +114,14 @@
    - not (( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat') and ansible_distribution_major_version == '6' )
    - wazuh_manager_config.cluster.disable != 'yes'

- name: RedHat/CentOS/Fedora | download Oracle Java RPM
-  get_url:
-    url: https://download.oracle.com/otn-pub/java/jdk/8u202-b08/1961070e4c9b4e26a04e7f5a083f551e/jre-8u202-linux-x64.rpm
-    dest: /tmp/jre-8-linux-x64.rpm
-    headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
-  register: oracle_java_task_rpm_download
-  until: oracle_java_task_rpm_download is succeeded
+- name: RedHat/CentOS/Fedora | Install OpenJDK 1.8
+  yum: name=java-1.8.0-openjdk state=present
  when:
    - wazuh_manager_config.cis_cat.disable == 'no'
    - wazuh_manager_config.cis_cat.install_java == 'yes'
  tags:
    - init

- name: RedHat/CentOS/Fedora | Install Oracle Java RPM
-  package: name=/tmp/jre-8-linux-x64.rpm state=present
-  register: wazuh_manager_oracle_java_installed
-  until: wazuh_manager_oracle_java_installed is succeeded
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
-    - oracle_java_task_rpm_download is defined
-  tags:
-    - init
-
 - name: Set Distribution CIS filename for RHEL5/CentOS-5
  set_fact:
    cis_distribution_filename: cis_rhel5_linux_rcl.txt