From 8695f49f2b2e35afa92431c38fdae2477d1c1744 Mon Sep 17 00:00:00 2001
From: Alessandro Fael Garcia <alessfg@hotmail.com>
Date: Tue, 19 Feb 2019 16:30:10 +0100
Subject: [PATCH] Refactor signing key tasks (#105)

---
 tasks/keys/apt-key.yml | 10 ++++++++--
 tasks/keys/rpm-key.yml | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tasks/keys/apt-key.yml b/tasks/keys/apt-key.yml
index 0153940..7abb01c 100644
--- a/tasks/keys/apt-key.yml
+++ b/tasks/keys/apt-key.yml
@@ -1,8 +1,14 @@
 ---
+- name: "(Install: APT OSs) Set Default APT NGINX Signing Key URL"
+  set_fact:
+    default_keysite: >-
+      {{ (ansible_distribution_release == 'trusty')
+      | ternary('http://nginx.org/keys/nginx_signing.key', 'https://nginx.org/keys/nginx_signing.key') }}
+
 - name: "(Install: APT OSs) Set APT NGINX Signing Key URL"
   set_fact:
-    keysite: "{{ nginx_signing_key | default('http://nginx.org/keys/nginx_signing.key') }}"
+    keysite: "{{ nginx_signing_key | default(default_keysite) }}"
 
 - name: "(Install: APT OSs) Add APT NGINX Signing Key"
   apt_key:
-    url: "{{ keysite | default('https://nginx.org/keys/nginx_signing.key') }}"
+    url: "{{ keysite }}"
diff --git a/tasks/keys/rpm-key.yml b/tasks/keys/rpm-key.yml
index e3356c5..0323d56 100644
--- a/tasks/keys/rpm-key.yml
+++ b/tasks/keys/rpm-key.yml
@@ -1,8 +1,14 @@
 ---
+- name: "(Install: RPM OSs) Set Default RPM NGINX Signing Key"
+  set_fact:
+    default_keysite: >-
+      {{ (ansible_distribution_major_version|int == 6)
+      | ternary('http://nginx.org/keys/nginx_signing.key', 'https://nginx.org/keys/nginx_signing.key') }}
+
 - name: "(Install: RPM OSs) Set RPM NGINX Signing Key URL"
   set_fact:
-    keysite: "{{ nginx_signing_key | default('http://nginx.org/keys/nginx_signing.key') }}"
+    keysite: "{{ nginx_signing_key | default(default_keysite) }}"
 
 - name: "(Install: RPM OSs) Add RPM NGINX Signing Key"
   rpm_key:
-    key: "{{ keysite | default('https://nginx.org/keys/nginx_signing.key') }}"
+    key: "{{ keysite }}"