Merge pull request #73 from wazuh/Java-Repository-3.7-PR

Improve of the Java repository
This commit is contained in:
AlfonsoRBJ 2018-11-02 11:44:13 +01:00 committed by GitHub
commit c9251be2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions

View File

@ -1,4 +1,3 @@
--- ---
- name: Debian/Ubuntu | Install apt-transport-https and ca-certificates - name: Debian/Ubuntu | Install apt-transport-https and ca-certificates
apt: apt:
@ -9,14 +8,14 @@
- apt-transport-https - apt-transport-https
- ca-certificates - ca-certificates
- name: Debian/Ubuntu | Setting webupd8 repository - when: elasticsearch_install_java
block:
- name: Debian/Ubuntu | Setting webupd8 repository
apt_repository: apt_repository:
repo: 'ppa:webupd8team/java' repo: 'ppa:webupd8team/java'
codename: 'xenial' codename: 'xenial'
update_cache: yes update_cache: yes
- when: elasticsearch_install_java
block:
- name: Debian/Ubuntu | Accept Oracle Java 8 license - name: Debian/Ubuntu | Accept Oracle Java 8 license
debconf: debconf:
name: oracle-java8-installer name: oracle-java8-installer

View File

@ -8,13 +8,13 @@
- apt-transport-https - apt-transport-https
- ca-certificates - ca-certificates
- name: Debian/Ubuntu | Setting webupd8 repository - when: logstash_install_java
block:
- name: Debian/Ubuntu | Setting webupd8 repository
apt_repository: apt_repository:
repo: 'ppa:webupd8team/java' repo: 'ppa:webupd8team/java'
codename: 'xenial' codename: 'xenial'
- when: logstash_install_java
block:
- name: Debian/Ubuntu | Accept Oracle Java 8 license - name: Debian/Ubuntu | Accept Oracle Java 8 license
debconf: debconf:
name: oracle-java8-installer name: oracle-java8-installer