From 69fd489efc733662c1df28de74dd393664b3b2b6 Mon Sep 17 00:00:00 2001 From: Gabriel Linder Date: Tue, 13 Oct 2020 14:57:33 +0200 Subject: [PATCH 1/2] Use standard method apt_key. --- tasks/build.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tasks/build.yml b/tasks/build.yml index ed5cae1..de0f2d9 100644 --- a/tasks/build.yml +++ b/tasks/build.yml @@ -7,22 +7,10 @@ state: present - name: Download OpenJDK PGP key (works with Bionic behind a proxy) - become: yes - get_url: - dest: /usr/local/src/java_openjdk.asc - mode: 0644 - url: "{{ sansible_java_apt_keyserver }}/pks/lookup?op=get&search=0x{{ sansible_java_apt_key_id }}" - retries: 2 - delay: 10 - register: sansible_java_pgp_result - until: sansible_java_pgp_result is succeeded - -- name: Ensures OpenJDK PGP key is known become: yes apt_key: - file: /usr/local/src/java_openjdk.asc + keyserver: "{{ sansible_java_apt_keyserver }}" id: "{{ sansible_java_apt_key_id }}" - state: present - name: Add OpenJDK repo become: yes From d121bdfccc7fb5d97659aa5d8c45c8af184bddf0 Mon Sep 17 00:00:00 2001 From: Morgan Christiansson Date: Wed, 22 Sep 2021 15:01:42 +0100 Subject: [PATCH 2/2] Revert to keyserver.ubuntu.com http://sks-keyservers.net has stopped working --- README.md | 2 +- defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99276b4..6f0dbf1 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Argument | Default | Description ----------|---------|------------ sansible_java_apt_key_id | EB9B1D8886F44E2A | Fingerprint of PGP used to verify repo -sansible_java_apt_keyserver | http://eu.pool.sks-keyservers.net | Keyserver to grab PGP key from +sansible_java_apt_keyserver | http://keyserver.ubuntu.com | Keyserver to grab PGP key from sansible_java_apt_repo | See defaults | The repo to grab packages from sansible_java_set_as_default | yes | Set the installed version as default sansible_java_version | 8 | The Java version to be installed diff --git a/defaults/main.yml b/defaults/main.yml index 0c8647e..6d52303 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- sansible_java_apt_key_id: EB9B1D8886F44E2A -sansible_java_apt_keyserver: http://eu.pool.sks-keyservers.net +sansible_java_apt_keyserver: http://keyserver.ubuntu.com sansible_java_apt_repo: "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu {{ ansible_distribution_release | lower }} main" sansible_java_set_as_default: yes sansible_java_version: 7