From 46ffcc3765330eb92b2a3857b2109f8bb85daf4d Mon Sep 17 00:00:00 2001 From: Michael Goodwin Date: Wed, 28 Feb 2018 08:11:45 -0500 Subject: [PATCH] Be more explicit about `gpg2` and... - Allow for configuration of gpg command - New variable: `rocket_chat_pgp_command`: gpg2 (default) - Can be absolute path or in $PATH --- defaults/main.yml | 1 + tasks/main.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9f3bb8e..aff2211 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,7 @@ rocket_chat_tarball_check_checksum: false rocket_Chat_tarball_check_pgp: true rocket_chat_tarball_fetch_timeout: 100 rocket_chat_tarball_validate_remote_cert: true +rocket_chat_pgp_command: gpg2 rocket_chat_service_user: rocketchat rocket_chat_service_group: rocketchat rocket_chat_service_host: "{{ ansible_fqdn }}" diff --git a/tasks/main.yml b/tasks/main.yml index 5fe9c39..6987830 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -140,9 +140,10 @@ - name: Setup PGP for verifying the Rocket.Chat tarball block: - - name: Import RochetChat PGP Key from default keyservers + - name: "Import RochetChat PGP Key from keyserver: {{ rocket_chat_tarball_gpg_keyserver }}" shell: | - gpg --keyserver "{{ rocket_chat_tarball_gpg_keyserver }}" \ + {{ rocket_chat_pgp_command }} \ + --keyserver "{{ rocket_chat_tarball_gpg_keyserver }}" \ --recv-keys "{{ rocket_chat_tarball_gpg_key }}" register: add_key changed_when: "'not changed' not in add_key.stderr" @@ -183,8 +184,9 @@ - name: Verify Rocket.Chat binary tarball with GPG shell: | - gpg --verify rocket.chat-{{ rocket_chat_version }}.asc \ - rocket.chat-{{ rocket_chat_version }}.tgz + {{ rocket_chat_pgp_command }} \ + --verify rocket.chat-{{ rocket_chat_version }}.asc \ + rocket.chat-{{ rocket_chat_version }}.tgz args: chdir: "{{ rocket_chat_application_path }}" when: rocket_Chat_tarball_check_pgp