Skip to content

Commit

Permalink
chore: Remove unnecessary task when installing modules on Alpine Linux (
Browse files Browse the repository at this point in the history
  • Loading branch information
alessfg authored Aug 4, 2024
1 parent 822267f commit 6a0e0fc
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ TESTS:

- Update RHEL UBI images to UBI 8.10 and UBI 9.4.

MAINTENANCE:

- Installing certain NGINX modules on Alpine Linux 3.17 no longer requires installing `nginx-plus-module-ndk` as a separate step.

CI/CD:

- Update GitHub Actions to Ubuntu 24.04.
Expand Down
35 changes: 18 additions & 17 deletions tasks/modules/install-modules.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
---
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install GeoIP2 and/or OpenTracing EPEL dependency
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install OpenTracing EPEL dependency
when:
- ansible_facts['os_family'] == "RedHat"
- not (ansible_facts['distribution'] == "Amazon" and ansible_facts['distribution_major_version'] is version('2023', '=='))
- ('opentracing' in nginx_modules)
- nginx_install_epel_release | bool
block:
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Import EPEL GPG key
ansible.builtin.rpm_key:
state: present
key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ((ansible_facts['distribution'] == 'Amazon') | ternary('7', ansible_facts['distribution_major_version'])) }}
- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install EPEL dependency
when: ansible_facts['distribution'] != "Amazon"
block:
- name: (AlmaLinux/Oracle Linux/RHEL/Rocky Linux) Import EPEL GPG key
ansible.builtin.rpm_key:
state: present
key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_facts['distribution_major_version'] }}

- name: (AlmaLinux/Amazon Linux/Oracle Linux/RHEL/Rocky Linux) Install EPEL
ansible.builtin.yum:
name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ((ansible_facts['distribution'] == 'Amazon') | ternary('7', ansible_facts['distribution_major_version'])) }}.noarch.rpm
- name: (AlmaLinux/Oracle Linux/RHEL/Rocky Linux) Install EPEL
ansible.builtin.yum:
name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_facts['distribution_major_version'] }}.noarch.rpm

- name: (Alpine Linux) Install Lua and Encrypted Sessions Alpine Linux 3.17 dependency
community.general.apk:
name: nginx-plus-module-ndk
when:
- nginx_type == 'plus'
- ansible_facts['os_family'] == 'Alpine'
- ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') is version('3.17', '==')
- ('encrypted-sessions' in nginx_modules) or ('lua' in nginx_modules) or ('set-misc' in nginx_modules)
- name: (Amazon Linux) Install EPEL
ansible.builtin.command:
cmd: amazon-linux-extras install -y epel
creates: /etc/yum.repos.d/epel.repo
when:
- ansible_facts['distribution'] == "Amazon"
- ansible_facts['distribution_major_version'] is version('2', '==')

- name: Install NGINX modules
ansible.builtin.package:
Expand Down

0 comments on commit 6a0e0fc

Please sign in to comment.