diff --git a/tasks/java-Debian.yml b/tasks/java-Debian.yml index e28e4fe..bbade0a 100644 --- a/tasks/java-Debian.yml +++ b/tasks/java-Debian.yml @@ -1,19 +1,5 @@ --- # Debian specific Java -- name: Debian - Define java_repos. - set_fact: - java_repos: "{{ __java_repos | list }}" - when: java_repos is not defined - -- name: Debian - Automatically select the Oracle License - tags: java - shell: echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections - changed_when: false - -- name: Debian - Add java repos - apt_repository: repo={{ item }} update_cache=yes state=present - with_items: java_repos - - name: Debian - Ensure Java is installed. apt: name={{ item }} state=present cache_valid_time=86400 with_items: java_packages diff --git a/vars/Debian.yml b/vars/Debian.yml index 72b450d..b482e7a 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,5 +1,3 @@ --- __java_packages: - - "oracle-java8-installer" -__java_repos: - - "ppa:webupd8team/java" + - "openjdk-7-jre"