From 301416a9c9c80f979fbfd6246745c228c699d60b Mon Sep 17 00:00:00 2001
From: Tom Gamull <tom.gamull@gmail.com>
Date: Fri, 17 Apr 2020 18:40:35 -0400
Subject: [PATCH] Issue239 - fix nginx_version in module install (#240)

---
 defaults/main/main.yml                 | 4 +++-
 tasks/modules/install-geoip.yml        | 4 ++--
 tasks/modules/install-image-filter.yml | 4 ++--
 tasks/modules/install-njs.yml          | 4 ++--
 tasks/modules/install-perl.yml         | 4 ++--
 tasks/modules/install-rtmp.yml         | 2 +-
 tasks/modules/install-waf.yml          | 2 +-
 tasks/modules/install-xslt.yml         | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/defaults/main/main.yml b/defaults/main/main.yml
index 98d827c..7d1dbe6 100644
--- a/defaults/main/main.yml
+++ b/defaults/main/main.yml
@@ -17,7 +17,9 @@ nginx_type: opensource
 
 # Specify which version of NGINX you want to install.
 # Default is empty.
-# nginx_version: =19-1~bionic
+# nginx_version: "=19-1~bionic"
+# For Plus and modules you'll need a wilcard like below (which installs plus-20 and modules)
+# nginx_version: "-20*"
 
 # Specify whether you want to maintain your version of NGINX, upgrade to the latest version, or remove NGINX.
 # Can be used with `nginx_version` to achieve fine tune control on which version of NGINX is installed/used on each playbook execution.
diff --git a/tasks/modules/install-geoip.yml b/tasks/modules/install-geoip.yml
index 96b7aa2..124d0f0 100644
--- a/tasks/modules/install-geoip.yml
+++ b/tasks/modules/install-geoip.yml
@@ -7,13 +7,13 @@
 
 - name: "(Install: All OSs) Install NGINX Open Source GeoIP Module"
   package:
-    name: nginx-module-geoip
+    name: "nginx-module-geoip{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus GeoIP Module"
   package:
-    name: nginx-plus-module-geoip
+    name: "nginx-plus-module-geoip{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "plus"
 
diff --git a/tasks/modules/install-image-filter.yml b/tasks/modules/install-image-filter.yml
index c87c832..bbce180 100644
--- a/tasks/modules/install-image-filter.yml
+++ b/tasks/modules/install-image-filter.yml
@@ -1,13 +1,13 @@
 ---
 - name: "(Install: All OSs) Install NGINX Open Source Image Filter Module"
   package:
-    name: nginx-module-image-filter
+    name: "nginx-module-image-filter{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus Image Filter Module"
   package:
-    name: nginx-plus-module-image-filter
+    name: "nginx-plus-module-image-filter{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "plus"
 
diff --git a/tasks/modules/install-njs.yml b/tasks/modules/install-njs.yml
index 1f92254..f0a2a8a 100644
--- a/tasks/modules/install-njs.yml
+++ b/tasks/modules/install-njs.yml
@@ -1,13 +1,13 @@
 ---
 - name: "(Install: All OSs) Install NGINX Open Source JavaScript Module"
   package:
-    name: nginx-module-njs
+    name: "nginx-module-njs{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus JavaScript Module"
   package:
-    name: nginx-plus-module-njs
+    name: "nginx-plus-module-njs{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "plus"
 
diff --git a/tasks/modules/install-perl.yml b/tasks/modules/install-perl.yml
index 3e484d9..eb8fac3 100644
--- a/tasks/modules/install-perl.yml
+++ b/tasks/modules/install-perl.yml
@@ -6,13 +6,13 @@
 
 - name: "(Install: All OSs) Install NGINX Open Source Perl Module"
   package:
-    name: nginx-module-perl
+    name: "nginx-module-perl{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus Perl Module"
   package:
-    name: nginx-plus-module-perl
+    name: "nginx-plus-module-perl{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "plus"
 
diff --git a/tasks/modules/install-rtmp.yml b/tasks/modules/install-rtmp.yml
index 5d1bc61..77b1dfd 100644
--- a/tasks/modules/install-rtmp.yml
+++ b/tasks/modules/install-rtmp.yml
@@ -1,7 +1,7 @@
 ---
 - name: "(Install: All OSs) Install NGINX Plus RTMP Module"
   package:
-    name: nginx-plus-module-rtmp
+    name: "nginx-plus-module-rtmp{{ nginx_version | default('') }}"
     state: present
 
 - name: "(Setup: All NGINX) Load NGINX RTMP Module"
diff --git a/tasks/modules/install-waf.yml b/tasks/modules/install-waf.yml
index fea2e79..806cfd3 100644
--- a/tasks/modules/install-waf.yml
+++ b/tasks/modules/install-waf.yml
@@ -1,7 +1,7 @@
 ---
 - name: "(Install: All OSs) Install NGINX Plus WAF Module"
   package:
-    name: nginx-plus-module-modsecurity
+    name: "nginx-plus-module-modsecurity{{ nginx_version | default('') }}"
     state: present
 
 - name: "(Setup: NGINX Plus) Load NGINX Plus WAF Module"
diff --git a/tasks/modules/install-xslt.yml b/tasks/modules/install-xslt.yml
index 8dc5083..d73f552 100644
--- a/tasks/modules/install-xslt.yml
+++ b/tasks/modules/install-xslt.yml
@@ -1,13 +1,13 @@
 ---
 - name: "(Install: All OSs) Install NGINX Open Source XSLT Module"
   package:
-    name: nginx-module-xslt
+    name: "nginx-module-xslt{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "opensource"
 
 - name: "(Install: All OSs) Install NGINX Plus XSLT Module"
   package:
-    name: nginx-plus-module-xslt
+    name: "nginx-plus-module-xslt{{ nginx_version | default('') }}"
     state: present
   when: nginx_type == "plus"