From d1a18c13419968491c346495a23bbe2ef3ad419a Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 2 Nov 2017 09:59:38 +1100 Subject: [PATCH 1/3] java 8 from webupd8 for ubuntu and debian8 --- ansible/roles/java-base/tasks/main.yml | 30 ++++++++++++++++++++++++++ ansible/roles/java-base/vars/main.yml | 5 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index 0abe33565..f10a0f27a 100644 --- a/ansible/roles/java-base/tasks/main.yml +++ b/ansible/roles/java-base/tasks/main.yml @@ -4,8 +4,38 @@ # installs java # +- name: install add-apt-repostory + when: os in ("ubuntu1204", "ubuntu1404") + package: name=software-properties-common state=present + +- name: add webupd8 oracle java repository + when: os in ("ubuntu1204", "ubuntu1404") + apt_repository: repo='ppa:webupd8team/java' + +- name: add webupd8team oracle java repository + when: os == "debian8" + lineinfile: + dest: /etc/apt/sources.list + state: present + line: deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main + +- name: add webupd8team oracle java repository key + when: os == "debian8" + shell: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 + +- name: accept webupd8 oracle java 8 license + when: os in ("ubuntu1204", "ubuntu1404") or os == "debian8" + debconf: name='oracle-java8-installer' question='shared/accepted-oracle-license-v1-1' value='true' vtype='select' + # if this fails you want to check in vars/main.yml and add package name # as appropriate -- try to use generic os family if available. - name: install java when: not os|startswith("zos") package: name="{{ java_package_name }}" state=present + +- name: install webupd8 oracle java 8 extras + when: os in ("ubuntu1204", "ubuntu1404") + package: name="{{item}}" state=present + with_items: + - ca-certificates + - oracle-java8-set-default diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index ed6c6cf98..4f46085b7 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -9,12 +9,13 @@ packages: { 'centos5': 'java-1.7.0-openjdk', 'centos': 'java-1.8.0-openjdk-headless', 'debian7': 'openjdk-7-jre-headless', - 'debian8': 'openjdk-8-jre-headless', + 'debian8': 'oracle-java8-installer', 'fedora': 'java-1.8.0-openjdk-headless', 'freebsd': 'openjdk8-jre', 'smartos': 'openjdk8', 'ubuntu': 'openjdk-8-jre-headless', - 'ubuntu1404': 'openjdk-7-jre-headless', + 'ubuntu1404': 'oracle-java8-installer', + 'ubuntu1204': 'oracle-java8-installer', } java_package_name: "{{ packages[os]|default(packages[os|stripversion])|default('missing') }}" From 258d30347a2cfece7ae3354dc8fcc139f6422dd2 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 2 Nov 2017 10:00:39 +1100 Subject: [PATCH 2/3] libfontconfig for citgm/phantomjs, + minor tweaks --- ansible/roles/baselayout/vars/main.yml | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 43699a828..2801aca6d 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -16,21 +16,22 @@ ssh_config: /etc/ssh/sshd_config sshd_service_map: { 'ubuntu1404': 'ssh', - } + 'ubuntu1204': 'ssh', +} sshd_service_name: "{{ sshd_service_map[os]|default(sshd_service_map[os|stripversion])|default('sshd') }}" ntp_service: { systemd: ['debian8', 'ubuntu1604', 'ubuntu1610'], ntp_package: ['ubuntu1404'] - } +} common_packages: [ 'automake', 'bash', 'libtool', 'sudo', - ] +] # you can either add os family or os to this list (see smartos) # but the playbook chooses os over family - not both @@ -51,26 +52,28 @@ packages: { centos: [ 'ccache', 'git', - ], + ], centos7: [ 'gcc-c++', - ], + ], debian7: [ 'gcc-4.8', 'g++-4.8', - ], + ], debian8: [ 'ccache', 'git', - ], + 'libfontconfig1', + ], fedora: [ 'ccache', 'gcc-c++', 'git', + 'fontconfig', ], freebsd: [ @@ -86,7 +89,7 @@ packages: { 'git', 'gmake', 'xz' - ], + ], smartos15: [ 'gcc49', @@ -95,7 +98,7 @@ packages: { 'git', 'gmake', 'xz' - ], + ], smartos16: [ 'gcc49', @@ -104,16 +107,17 @@ packages: { 'git', 'gmake', 'xz' - ], + ], ubuntu: [ 'ccache', 'g++', 'gcc', 'git', - ], + 'libfontconfig1', + ], ubuntu1404: [ 'ntp', - ] - } + ] +} From a9dd8a0d01ec23af24f8c76fd7eb2629d109be6c Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 2 Nov 2017 10:01:18 +1100 Subject: [PATCH 3/3] rename ubuntu12->ubuntu1204 --- ansible/inventory.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index b820e4aad..e925b3594 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -90,8 +90,8 @@ hosts: freebsd10-x64-1: {ip: 159.203.59.134, user: freebsd} freebsd11-x64-1: {ip: 45.55.90.237, user: freebsd} freebsd11-x64-2: {ip: 107.170.28.213, user: freebsd} - ubuntu12-x64-1: {ip: 104.236.234.182} - ubuntu12-x64-2: {ip: 107.170.104.83} + ubuntu1204-x64-1: {ip: 104.236.234.182} + ubuntu1204-x64-2: {ip: 107.170.104.83} ubuntu1404-x64-1: {ip: 45.55.252.223} ubuntu1404-x86-1: {ip: 159.203.115.220} ubuntu1604-x86-1: {ip: 159.203.77.233}