Skip to content

Commit 63a95d0

Browse files
committed
Update supported NGINX Plus dynamic modules
1 parent 8c73085 commit 63a95d0

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ BREAKING CHANGES:
2020

2121
FEATURES:
2222

23-
* Add AlmaLinux, Oracle Linux and Rocky Linux to the list of NGINX OSS and NGINX Plus tested and supported platforms.
24-
* Add Alpine Linux 3.17 to the NGINX list of tested and supported platforms (and remove Alpine Linux 3.13 from the list of NGINX OSS supported platforms).
23+
* Add support for the newer `ndk` and `set-misc` NGINX Plus dynamic modules and remove old code checks for distributions that are no longer supported.
24+
* Add AlmaLinux, Oracle Linux and Rocky Linux to the list of NGINX OSS and NGINX Plus tested and supported distributions.
25+
* Add Alpine Linux 3.17 to the NGINX list of tested and supported platforms (and remove Alpine Linux 3.13 from the list of NGINX OSS supported distributions).
2526

2627
ENHANCEMENTS:
2728

defaults/main/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,16 @@ nginx_modules: []
111111
# - headers-more # NGINX Plus
112112
# - image-filter
113113
# - lua # NGINX Plus
114+
# - ndk # NGINX Plus
114115
# - name: njs # Required
115116
# state: present # Optional
116117
# version: =1.19.4+0.4.4-1~bionic # Optional
117118
# - opentracing # NGINX Plus
118119
# - passenger # NGINX Plus
119-
# - perl # NGINX Plus
120+
# - perl
120121
# - prometheus # NGINX Plus
121-
# - rtmp
122+
# - rtmp # NGINX Plus
123+
# - set-misc # NGINX Plus
122124
# - subs-filter # NGINX Plus
123125
# - waf # NGINX Plus
124126
# - xslt

molecule/plus/converge.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
- perl
2727
- prometheus
2828
- rtmp
29+
- set-misc
2930
- subs-filter
3031
- xslt

tasks/modules/install-modules.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- nginx_type == 'plus'
4747
- ansible_facts['os_family'] == "Alpine"
4848
- ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') is version('3.17', '==')
49-
- ('"lua" in nginx_modules') or ('"encrypted-sessions" in nginx_modules')
49+
- ('"encrypted-sessions" in nginx_modules') or ('"lua" in nginx_modules') or ('"set-misc" in nginx_modules')
5050

5151
- name: Setup NGINX modules
5252
ansible.builtin.package:
@@ -57,21 +57,12 @@
5757
when:
5858
- (item.name | default(item) in nginx_modules_list and nginx_type == 'opensource')
5959
or (item.name | default(item) in nginx_plus_modules_list and nginx_type == 'plus')
60-
- not (item.name | default(item) == "auth-spnego")
61-
or not (ansible_facts['os_family'] == "Alpine" and (ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') is version('3.8', '==')))
6260
- not (item.name | default(item) == "brotli")
63-
or not ((ansible_facts['os_family'] == "Alpine")
64-
or (ansible_facts['distribution'] == "Amazon")
65-
or (ansible_facts['os_family'] == "Debian" and ansible_facts['distribution_major_version'] is version('9', '=='))
66-
or (ansible_facts['distribution'] == "OracleLinux")
67-
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '<'))
68-
or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '<')))
61+
or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))
6962
- not (item.name | default(item) == "geoip")
7063
or not ((ansible_facts['os_family'] == "FreeBSD")
7164
or (ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('8', '>=')))
7265
- not (item.name | default(item) == "geoip2")
73-
or not ((ansible_facts['distribution'] == 'Amazon')
74-
or (ansible_facts['os_family'] == "Suse"))
66+
or not (ansible_facts['os_family'] == "Suse")
7567
- not (item.name | default(item) == "opentracing")
76-
or not ((ansible_facts['distribution'] == 'Amazon')
77-
or (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '==')))
68+
or not (ansible_facts['os_family'] == "Suse" and ansible_facts['distribution_major_version'] is version('12', '=='))

vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ nginx_modules_list: [
8686
# Supported NGINX Plus dynamic modules
8787
nginx_plus_modules_list: [
8888
auth-spnego, brotli, encrypted-session, geoip, geoip2, headers-more, image-filter,
89-
lua, njs, opentracing, passenger, perl, prometheus, rtmp, subs-filter, xslt,
89+
lua, ndk, njs, opentracing, passenger, perl, prometheus, rtmp, set-misc, subs-filter, xslt,
9090
]

0 commit comments

Comments
 (0)