diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 12:30:14 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-12-07 12:30:14 -0700 |
| commit | 0b6a92b9fb109fc6b2dd5c4acf2091835f97d98c (patch) | |
| tree | 3df4ea49c4e3fd9b13475298a75779b7556764e5 | |
| parent | 1fe245611e15eb2130c0d1e9e0f477c8adee6ba5 (diff) | |
Install ca-certificates-java and run update-ca-certificates
Issue: IS-43
| -rw-r--r-- | salt/openbook/ansible/files/openjdk.yaml | 4 | ||||
| -rw-r--r-- | salt/openbook/baseimage/files/installdeps.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/salt/openbook/ansible/files/openjdk.yaml b/salt/openbook/ansible/files/openjdk.yaml index 00c7d90..676386f 100644 --- a/salt/openbook/ansible/files/openjdk.yaml +++ b/salt/openbook/ansible/files/openjdk.yaml @@ -13,6 +13,7 @@ state: present with_items: - openjdk-8-jdk-headless + - ca-certificates-java when: ansible_distribution == "Ubuntu" - name: "Update yum cache" @@ -57,3 +58,6 @@ with_items: - { regexp: '^securerandom.source=file:/dev/random.*$', line: "securerandom.source=file:/dev/urandom" } when: ansible_distribution == "Gentoo" + + - name: "Ensure java root certs are packaged" + shell: update-ca-certificates diff --git a/salt/openbook/baseimage/files/installdeps.sh b/salt/openbook/baseimage/files/installdeps.sh index 710e4eb..1a1b1be 100644 --- a/salt/openbook/baseimage/files/installdeps.sh +++ b/salt/openbook/baseimage/files/installdeps.sh @@ -3,5 +3,5 @@ export DEBIAN_FRONTEND=noninteractive apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless ca-certificates-java +apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless exit 0 |