sebclem/ansible-role-nginx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove RHEL/CentOS 6 parameters given they have reached EOL (#451)

Browse Source
This commit is contained in:
Alessandro Fael Garcia 2021-10-06 01:41:24 +02:00 committed by GitHub
parent 5dbbe39ca4
commit 3f101ba48b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
ENHANCEMENTS: 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. * 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. * Move non NGINX specific dependencies from the role into the Molecule Dockerfile.

1
tasks/keys/setup-keys.yml
View File

@ -27,5 +27,4 @@
rpm_key: rpm_key:
fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 fingerprint: 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
key: "{{ keysite }}" key: "{{ keysite }}"
validate_certs: "{{ (ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('false', 'true') }}"
when: ansible_facts['os_family'] in ['RedHat', 'Suse'] when: ansible_facts['os_family'] in ['RedHat', 'Suse']

3
tasks/modules/install-modules.yml
View File

@ -30,5 +30,4 @@
or (ansible_facts['distribution'] == "OracleLinux")) or (ansible_facts['distribution'] == "OracleLinux"))
- not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse") - not (item.name | default(item) == "geoip2") or not (ansible_facts['os_family'] == "Suse")
- not (item.name | default(item) == "opentracing") - not (item.name | default(item) == "opentracing")
or not ((ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '==')) 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', '==')))

10
tasks/opensource/install-source.yml
View File

@ -130,8 +130,6 @@
url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz" url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz"
dest: "/tmp/{{ pcre_version }}.tar.gz" dest: "/tmp/{{ pcre_version }}.tar.gz"
mode: 0600 mode: 0600
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
register: pcre_source register: pcre_source
- name: Unpack PCRE dependency - name: Unpack PCRE dependency
@ -190,8 +188,6 @@
url: "https://zlib.net/{{ zlib_version }}.tar.gz" url: "https://zlib.net/{{ zlib_version }}.tar.gz"
dest: "/tmp/{{ zlib_version }}.tar.gz" dest: "/tmp/{{ zlib_version }}.tar.gz"
mode: 0600 mode: 0600
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
register: zlib_source register: zlib_source
- name: Unpack ZLib dependency - name: Unpack ZLib dependency
@ -250,8 +246,6 @@
url: "https://www.openssl.org/source/{{ openssl_version }}.tar.gz" url: "https://www.openssl.org/source/{{ openssl_version }}.tar.gz"
dest: "/tmp/{{ openssl_version }}.tar.gz" dest: "/tmp/{{ openssl_version }}.tar.gz"
mode: 0600 mode: 0600
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
register: openssl_source register: openssl_source
- name: Unpack OpenSSL dependency - name: Unpack OpenSSL dependency
@ -285,8 +279,6 @@
uri: uri:
url: https://version.nginx.com/nginx/{{ nginx_branch }} url: https://version.nginx.com/nginx/{{ nginx_branch }}
return_content: true 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 check_mode: false
register: nginx_versions register: nginx_versions
@ -311,8 +303,6 @@
url: "https://nginx.org/download/{{ nginx_version }}.tar.gz" url: "https://nginx.org/download/{{ nginx_version }}.tar.gz"
dest: "/tmp/{{ nginx_version }}.tar.gz" dest: "/tmp/{{ nginx_version }}.tar.gz"
mode: 0600 mode: 0600
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
| ternary('false', 'true') }}"
register: nginx_source register: nginx_source
- name: Unpack NGINX - name: Unpack NGINX