Skip to content

Commit cff9791

Browse files
authored
fix: Use nginx_version when installing NGINX modules (#868)
1 parent 797c600 commit cff9791

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Changelog
22

3-
## 0.25.1
3+
## 0.25.1 (Unreleased)
44

55
BUG FIXES:
66

7-
- Ansible and Jinja software versions validation tasks in ansible check mode.
7+
- Fix Ansible and Jinja versions validation tasks in ansible check mode.
8+
- Correctly use the `nginx_version` (if defined) for NGINX module versions.
89

910
## 0.25.0 (Nov 28, 2024)
1011

molecule/version/converge.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636
- name: brotli
3737
version: "{{ ngx_version }}"
3838
- name: geoip
39-
version: "{{ ngx_version }}"
4039
- name: image-filter
4140
version: "{{ ngx_version }}"
4241
- name: njs
4342
state: present
4443
version: "{{ njs_version }}"
4544
- name: perl
46-
version: "{{ ngx_version }}"
4745
- name: xslt
4846
version: "{{ ngx_version }}"
4947
nginx_service_modify: true

tasks/modules/install-modules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
- name: Install NGINX modules
2929
ansible.builtin.package:
3030
name: "nginx-{{ (nginx_type == 'plus') | ternary('plus-', '') }}module-{{ item['name'] | default(item) }}\
31-
{{ (nginx_repository is not defined and ansible_facts['os_family'] == 'Alpine' and nginx_type != 'plus') | ternary('@nginx', '') }}{{ item['version'] | default('') }}"
31+
{{ (nginx_repository is not defined and ansible_facts['os_family'] == 'Alpine' and nginx_type != 'plus') | ternary('@nginx', '') }}{{ item['version'] | default((nginx_version is defined) | ternary(nginx_version, '')) }}"
3232
state: "{{ item['state'] | default('present') }}"
3333
loop: "{{ nginx_modules }}"
3434
when:

0 commit comments

Comments
 (0)