From 3f101ba48b3aae0464732a4b9460d1ab5678bce3 Mon Sep 17 00:00:00 2001
From: Alessandro Fael Garcia <alessfg@hotmail.com>
Date: Wed, 6 Oct 2021 01:41:24 +0200
Subject: [PATCH] Remove RHEL/CentOS 6 parameters given they have reached EOL
 (#451)

---
 CHANGELOG.md                        |  1 +
 tasks/keys/setup-keys.yml           |  1 -
 tasks/modules/install-modules.yml   |  3 +--
 tasks/opensource/install-source.yml | 10 ----------
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98a10ba..cbeaa1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ENHANCEMENTS:
 
+* Remove RHEL/CentOS 6 task specific parameters given those platforms have reached EOL.
 * Change Ansible Lint exceptions from using an ID identifier to a text identifier.
 * Move non NGINX specific dependencies from the role into the Molecule Dockerfile.
 
diff --git a/tasks/keys/setup-keys.yml b/tasks/keys/setup-keys.yml
index 05b888c..3c4d7b7 100644
--- a/tasks/keys/setup-keys.yml
+++ b/tasks/keys/setup-keys.yml
@@ -27,5 +27,4 @@
   rpm_key:
     fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
     key: "{{ keysite }}"
-    validate_certs: "{{ (ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('false', 'true') }}"
   when: ansible_facts['os_family'] in ['RedHat', 'Suse']
diff --git a/tasks/modules/install-modules.yml b/tasks/modules/install-modules.yml
index cd54906..4a7fc7b 100644
--- a/tasks/modules/install-modules.yml
+++ b/tasks/modules/install-modules.yml
@@ -30,5 +30,4 @@
       or (ansible_facts['distribution'] == "OracleLinux"))
     - not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
     - not (item.name | default(item) == "opentracing")
-      or not ((ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
-      or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('6', '==')))
+      or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
diff --git a/tasks/opensource/install-source.yml b/tasks/opensource/install-source.yml
index c39c02b..931bc49 100644
--- a/tasks/opensource/install-source.yml
+++ b/tasks/opensource/install-source.yml
@@ -130,8 +130,6 @@
         url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz"
         dest: "/tmp/{{ pcre_version }}.tar.gz"
         mode: 0600
-        validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
-                        | ternary('false', 'true') }}"
       register: pcre_source
 
     - name: Unpack PCRE dependency
@@ -190,8 +188,6 @@
         url: "https://zlib.net/{{ zlib_version }}.tar.gz"
         dest: "/tmp/{{ zlib_version }}.tar.gz"
         mode: 0600
-        validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
-                        | ternary('false', 'true') }}"
       register: zlib_source
 
     - name: Unpack ZLib dependency
@@ -250,8 +246,6 @@
         url: "https://www.openssl.org/source/{{ openssl_version }}.tar.gz"
         dest: "/tmp/{{ openssl_version }}.tar.gz"
         mode: 0600
-        validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
-                        | ternary('false', 'true') }}"
       register: openssl_source
 
     - name: Unpack OpenSSL dependency
@@ -285,8 +279,6 @@
       uri:
         url: https://version.nginx.com/nginx/{{ nginx_branch }}
         return_content: true
-        validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
-                        | ternary('false', 'true') }}"
       check_mode: false
       register: nginx_versions
 
@@ -311,8 +303,6 @@
         url: "https://nginx.org/download/{{ nginx_version }}.tar.gz"
         dest: "/tmp/{{ nginx_version }}.tar.gz"
         mode: 0600
-        validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
-                        | ternary('false', 'true') }}"
       register: nginx_source
 
     - name: Unpack NGINX