Skip to content

Commit 301416a

Browse files
authored
Issue239 - fix nginx_version in module install (#240)
1 parent 2289b6a commit 301416a

File tree

8 files changed

+15
-13
lines changed

8 files changed

+15
-13
lines changed

defaults/main/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ nginx_type: opensource
1717

1818
# Specify which version of NGINX you want to install.
1919
# Default is empty.
20-
# nginx_version: =19-1~bionic
20+
# nginx_version: "=19-1~bionic"
21+
# For Plus and modules you'll need a wilcard like below (which installs plus-20 and modules)
22+
# nginx_version: "-20*"
2123

2224
# Specify whether you want to maintain your version of NGINX, upgrade to the latest version, or remove NGINX.
2325
# Can be used with `nginx_version` to achieve fine tune control on which version of NGINX is installed/used on each playbook execution.

tasks/modules/install-geoip.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
- name: "(Install: All OSs) Install NGINX Open Source GeoIP Module"
99
package:
10-
name: nginx-module-geoip
10+
name: "nginx-module-geoip{{ nginx_version | default('') }}"
1111
state: present
1212
when: nginx_type == "opensource"
1313

1414
- name: "(Install: All OSs) Install NGINX Plus GeoIP Module"
1515
package:
16-
name: nginx-plus-module-geoip
16+
name: "nginx-plus-module-geoip{{ nginx_version | default('') }}"
1717
state: present
1818
when: nginx_type == "plus"
1919

tasks/modules/install-image-filter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
- name: "(Install: All OSs) Install NGINX Open Source Image Filter Module"
33
package:
4-
name: nginx-module-image-filter
4+
name: "nginx-module-image-filter{{ nginx_version | default('') }}"
55
state: present
66
when: nginx_type == "opensource"
77

88
- name: "(Install: All OSs) Install NGINX Plus Image Filter Module"
99
package:
10-
name: nginx-plus-module-image-filter
10+
name: "nginx-plus-module-image-filter{{ nginx_version | default('') }}"
1111
state: present
1212
when: nginx_type == "plus"
1313

tasks/modules/install-njs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
- name: "(Install: All OSs) Install NGINX Open Source JavaScript Module"
33
package:
4-
name: nginx-module-njs
4+
name: "nginx-module-njs{{ nginx_version | default('') }}"
55
state: present
66
when: nginx_type == "opensource"
77

88
- name: "(Install: All OSs) Install NGINX Plus JavaScript Module"
99
package:
10-
name: nginx-plus-module-njs
10+
name: "nginx-plus-module-njs{{ nginx_version | default('') }}"
1111
state: present
1212
when: nginx_type == "plus"
1313

tasks/modules/install-perl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
- name: "(Install: All OSs) Install NGINX Open Source Perl Module"
88
package:
9-
name: nginx-module-perl
9+
name: "nginx-module-perl{{ nginx_version | default('') }}"
1010
state: present
1111
when: nginx_type == "opensource"
1212

1313
- name: "(Install: All OSs) Install NGINX Plus Perl Module"
1414
package:
15-
name: nginx-plus-module-perl
15+
name: "nginx-plus-module-perl{{ nginx_version | default('') }}"
1616
state: present
1717
when: nginx_type == "plus"
1818

tasks/modules/install-rtmp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: "(Install: All OSs) Install NGINX Plus RTMP Module"
33
package:
4-
name: nginx-plus-module-rtmp
4+
name: "nginx-plus-module-rtmp{{ nginx_version | default('') }}"
55
state: present
66

77
- name: "(Setup: All NGINX) Load NGINX RTMP Module"

tasks/modules/install-waf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: "(Install: All OSs) Install NGINX Plus WAF Module"
33
package:
4-
name: nginx-plus-module-modsecurity
4+
name: "nginx-plus-module-modsecurity{{ nginx_version | default('') }}"
55
state: present
66

77
- name: "(Setup: NGINX Plus) Load NGINX Plus WAF Module"

tasks/modules/install-xslt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
- name: "(Install: All OSs) Install NGINX Open Source XSLT Module"
33
package:
4-
name: nginx-module-xslt
4+
name: "nginx-module-xslt{{ nginx_version | default('') }}"
55
state: present
66
when: nginx_type == "opensource"
77

88
- name: "(Install: All OSs) Install NGINX Plus XSLT Module"
99
package:
10-
name: nginx-plus-module-xslt
10+
name: "nginx-plus-module-xslt{{ nginx_version | default('') }}"
1111
state: present
1212
when: nginx_type == "plus"
1313

0 commit comments

Comments
 (0)