From 0b9f100aa54915132baf92217e6d874274fe2cee Mon Sep 17 00:00:00 2001
From: Marcus <mail@m4rcu5.nl>
Date: Mon, 9 Mar 2020 02:44:38 +0100
Subject: [PATCH] Use variable for gpg fingerprint

Using the fingerprint in the rpm_key module requires Ansible 2.9. Updated meta file to reflect this requirement.
---
 meta/main.yml            | 2 +-
 tasks/install/Debian.yml | 2 +-
 tasks/install/RedHat.yml | 1 +
 vars/main.yml            | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index f589906..7640ef6 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -16,7 +16,7 @@ galaxy_info:
   # - CC-BY
   license: GPLv3
 
-  min_ansible_version: 2.4
+  min_ansible_version: 2.9
 
   # If this a Container Enabled role, provide the minimum Ansible Container version.
   # min_ansible_container_version:
diff --git a/tasks/install/Debian.yml b/tasks/install/Debian.yml
index 81de0e7..1a236db 100644
--- a/tasks/install/Debian.yml
+++ b/tasks/install/Debian.yml
@@ -1,7 +1,7 @@
 - name: Add ZeroTier PGP key
   apt_key:
     url: "{{ zerotier_gpg_url }}"
-    id: "0x74A5E9C458E1A431F1DA57A71657198823E52A61"
+    id: "{{ zerotier_gpg_fingerprint }}"
 
 - name: Check if Ubuntu release has dedicated repo
   uri:
diff --git a/tasks/install/RedHat.yml b/tasks/install/RedHat.yml
index 473b51e..db5a0a4 100644
--- a/tasks/install/RedHat.yml
+++ b/tasks/install/RedHat.yml
@@ -2,6 +2,7 @@
   rpm_key:
     state: present
     key: "{{ zerotier_gpg_url }}"
+    fingerprint: "{{ zerotier_gpg_fingerprint }}"
 
 - name: Add ZeroTier repo for RHEL/CentOS
   yum_repository:
diff --git a/vars/main.yml b/vars/main.yml
index d83c2e2..fd0278b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -3,3 +3,4 @@
 zerotier_download_base_url: http://download.zerotier.com
 zerotier_deb_release_repo: "{{ ansible_facts['distribution_release'] }}"
 zerotier_gpg_url: https://download.zerotier.com/contact@zerotier.com.gpg
+zerotier_gpg_fingerprint: 74A5E9C458E1A431F1DA57A71657198823E52A61
\ No newline at end of file