From bd0c581ac1c6d1bb70b74dc988bde69cb36a5e51 Mon Sep 17 00:00:00 2001
From: Alessandro Fael Garcia <alessfg@hotmail.com>
Date: Wed, 27 Jun 2018 13:16:57 -0700
Subject: [PATCH] Refactor installation of NGINX Unit modules

Use a list that lets users specify which modules they want to install instead of installing all modules available in each distro
---
 defaults/main.yml               |  2 +-
 tasks/unit/install-modules.yml  |  6 +++
 tasks/unit/install-packages.yml | 88 ---------------------------------
 tasks/unit/install-unit.yml     |  4 +-
 tests/playbooks/nginx-unit.yml  |  4 +-
 5 files changed, 12 insertions(+), 92 deletions(-)
 create mode 100644 tasks/unit/install-modules.yml
 delete mode 100644 tasks/unit/install-packages.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index fb5c893..293fc01 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -31,7 +31,7 @@ branch: mainline
 # Install NGINX Unit and NGINX Unit packages.
 # Default is false.
 unit_enable: false
-unit_packages: false
+unit_modules: null
 
 # Install NGINX JavaScript, Perl, ModSecurity WAF (NGINX Plus only), GeoIP, Image-Filter, RTMP Media Streaming, and/or XSLT modules.
 # Default is false.
diff --git a/tasks/unit/install-modules.yml b/tasks/unit/install-modules.yml
new file mode 100644
index 0000000..fa5fccf
--- /dev/null
+++ b/tasks/unit/install-modules.yml
@@ -0,0 +1,6 @@
+- name: "(Install: All OSs) Install NGINX Unit Modules"
+  package:
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ unit_modules }}"
+  notify: "(Handler: All OSs) Start NGINX Unit"
diff --git a/tasks/unit/install-packages.yml b/tasks/unit/install-packages.yml
deleted file mode 100644
index 22553cd..0000000
--- a/tasks/unit/install-packages.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-- name: "(Install: CentOS) Install NGINX Unit Packages"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python
-    - unit-go
-    - unit-perl
-  when: ansible_distribution == "CentOS"
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: RedHat 6) Install NGINX Unit Packages"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python
-    - unit-perl
-  when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 6
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: RedHat 7) Install NGINX Unit Packages"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python
-    - unit-go
-    - unit-perl
-  when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: Amazon Linux) Install NGINX Unit Packages"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python27
-    - unit-python34
-    - unit-python35
-    - unit-python36
-    - unit-go
-    - unit-perl
-  when: ansible_distribution == "Amazon"
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: Debian Jessie) Install NGINX Unit"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python2.7
-    - unit-python3.4
-    - unit-perl
-  when: ansible_distribution == "Debian" and ansible_distribution_major_version|int == 8
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: Debian Stretch) Install NGINX Unit"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python2.7
-    - unit-python3.5
-    - unit-go1.7
-    - unit-go1.8
-    - unit-perl
-  when: ansible_distribution == "Debian" and ansible_distribution_major_version|int == 9
-  notify: "(Handler: All OSs) Start NGINX Unit"
-
-- name: "(Install: Ubuntu) Install NGINX Unit"
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - unit-php
-    - unit-python2.7
-    - unit-python3.5
-    - unit-go
-    - unit-perl
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int == 16
-  notify: "(Handler: All OSs) Start NGINX Unit"
diff --git a/tasks/unit/install-unit.yml b/tasks/unit/install-unit.yml
index b8e6a34..08dd30c 100644
--- a/tasks/unit/install-unit.yml
+++ b/tasks/unit/install-unit.yml
@@ -11,5 +11,5 @@
     state: present
   notify: "(Handler: All OSs) Start NGINX Unit"
 
-- import_tasks: install-packages.yml
-  when: unit_packages
+- import_tasks: install-modules.yml
+  when: unit_modules is defined and unit_modules
diff --git a/tests/playbooks/nginx-unit.yml b/tests/playbooks/nginx-unit.yml
index 4228bfc..cd0472e 100644
--- a/tests/playbooks/nginx-unit.yml
+++ b/tests/playbooks/nginx-unit.yml
@@ -6,4 +6,6 @@
     - ansible-role-nginx
   vars:
     unit_enable: true
-    unit_packages: true
+    unit_modules:
+      - unit-php
+      - unit-perl