library/roles/oracle-jdk/tasks/main.yml: Add the letsencrypt CA to the keyring only if the jdk version is <= 7.

This commit is contained in:
Andrea Dell'Amico 2016-09-23 11:45:14 +02:00
parent 7b396eb51c
commit 67b71595c0
1 changed files with 5 additions and 2 deletions

View File

@ -38,7 +38,7 @@
notify: Set the default Oracle JDK
- name: Install a custom version of Oracle JDK from a tar file
unarchive: src={{ jdk_tarfile }} dest={{ jdk_java_home_prefix }}
unarchive: src={{ jdk_tarfile }} dest={{ jdk_java_home_prefix }} copy={{ jdk_copy_tarfile | default(omit) }}
when: '{{ jdk_use_tarfile }}'
- name: Set fact jdk_installed
@ -46,9 +46,12 @@
- name: Get the Letsencrypt cross signed X3 CA certificate
get_url: url='https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.der' dest=/srv/lets-encrypt-x3-cross-signed.der
when: jdk_default <= 7
- name: Change the default keyring. Insert the Letsencrypt X3 cross signed CA certificate
shell: keytool -trustcacerts -keystore {{ jdk_java_home }}/jre/lib/security/cacerts -storepass changeit -noprompt -importcert -alias lets-encrypt-x3-cross-signed -file /srv/lets-encrypt-x3-cross-signed.der
when: ( jdk_install | changed )
when:
- ( jdk_install | changed )
- jdk_default <= 7
tags: [ 'oracle_jdk', 'jdk' ]