Issue #5: Allow apache_packages to be overridden.

geerlingguy · Oct 5, 2014 · 83ab160 · seschwar · Oct 15, 2014 · 83ab160
1 parent a59400e
commit 83ab160
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,6 +1,16 @@
 ---
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family == 'RedHat'
+
+- name: Include OS-specific variables.
+  include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.codename }}.yml"
+  when: ansible_os_family == 'Debian'
+
+- name: Define apache_packages.
+  set_fact:
+    apache_packages: "{{ __apache_packages | list }}"
+  when: apache_packages is not defined
 
 - include: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'

diff --git a/vars/Debian.yml → vars/Debian-precise.yml b/vars/Debian.yml → vars/Debian-precise.yml
@@ -2,7 +2,7 @@
 apache_daemon: apache2
 apache_server_root: /etc/apache2
 apache_conf_path: /etc/apache2/sites-enabled
-apache_packages:
+__apache_packages:
     - apache2
     - apache2-mpm-prefork
     - apache2-utils

diff --git a/vars/Debian-trusty.yml b/vars/Debian-trusty.yml
@@ -0,0 +1,9 @@
+---
+apache_daemon: apache2
+apache_server_root: /etc/apache2
+apache_conf_path: /etc/apache2/sites-enabled
+__apache_packages:
+    - apache2
+    - apache2-mpm-prefork
+    - apache2-utils
+    - apache2-bin
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -2,7 +2,7 @@
 apache_daemon: httpd
 apache_server_root: /etc/httpd
 apache_conf_path: /etc/httpd/conf.d
-apache_packages:
+__apache_packages:
   - httpd
   - httpd-devel
   - mod_ssl