feat: update for xenial

As the apache2-mpm-prefork doesn't exist with xenial's apache any more, I removed `apache2_mpm_package` and renamed `apache2_packge` to `apache2_packages` to make it configureable.
weareinteractive · Oct 15, 2017 · a99bf1d · a99bf1d
1 parent 32c4c3d
commit a99bf1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+# apache2_packages:
+#   - apache2
+#   - apache2-mpm-prefork
 # apache2_module:
 #   - { id: auth, state: absent }
 #   - { id: rewrite, state: present }
@@ -27,10 +30,9 @@
 #     append: ''
 #
 
-# package name (version)
-apache2_package: apache2
-# mpm package name (version)
-apache2_mpm_package: apache2-mpm-prefork
+# packages (versions)
+apache2_packages:
+  - apache2
 # ports to listen to
 apache2_ports: [80]
 # ssl ports to listen to

diff --git a/tasks/install.yml b/tasks/install.yml
@@ -4,9 +4,7 @@
   apt:
     pkg: "{{ item }}"
     state: present
-  with_items:
-    - "{{ apache2_package }}"
-    - "{{ apache2_mpm_package }}"
+  with_items: "{{ apache2_packages }}"
 
 - name: Adding rules
   copy: