From 21845388765ad28cc6fd235403ca54e0b945ec4d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 5 May 2014 09:45:51 -0500
Subject: [PATCH] Use defaults instead of main vars for easier overriding.

---
 README.md           |  2 +-
 defaults/Debian.yml | 14 ++++++++++++++
 defaults/RedHat.yml | 11 +++++++++++
 defaults/main.yml   | 10 ++++++++++
 vars/Debian.yml     | 14 +-------------
 vars/RedHat.yml     | 11 +----------
 vars/main.yml       | 10 +---------
 7 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 defaults/Debian.yml
 create mode 100644 defaults/RedHat.yml
 create mode 100644 defaults/main.yml

diff --git a/README.md b/README.md
index c21fd2f..2d219c2 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ None.
 
 ## Role Variables
 
-Available variables are listed below, along with default values (see `vars/main.yml`):
+Available variables are listed below, along with default values (see `defaults/main.yml`):
 
     apache_enablerepo: ""
 
diff --git a/defaults/Debian.yml b/defaults/Debian.yml
new file mode 100644
index 0000000..e4e6e51
--- /dev/null
+++ b/defaults/Debian.yml
@@ -0,0 +1,14 @@
+---
+apache_daemon: apache2
+apache_server_root: /etc/apache2
+apache_conf_path: /etc/apache2/sites-enabled
+apache_packages:
+    - apache2
+    - apache2-mpm-prefork
+    - apache2-utils
+    - apache2.2-bin
+    - apache2.2-common
+apache_vhosts:
+  - {servername: "local.dev", documentroot: "/var/www"}
+apache_mods_enabled:
+  - rewrite.load
diff --git a/defaults/RedHat.yml b/defaults/RedHat.yml
new file mode 100644
index 0000000..4dccbd6
--- /dev/null
+++ b/defaults/RedHat.yml
@@ -0,0 +1,11 @@
+---
+apache_daemon: httpd
+apache_server_root: /etc/httpd
+apache_conf_path: /etc/httpd/conf.d
+apache_packages:
+  - httpd
+  - httpd-devel
+  - mod_ssl
+  - openssh
+apache_vhosts:
+  - {servername: "local.dev", documentroot: "/var/www/html"}
diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..3388292
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,10 @@
+---
+apache_enablerepo: ""
+
+apache_listen_port: 80
+
+apache_create_vhosts: true
+
+apache_vhosts:
+  # Additional properties: 'serveradmin, extra_parameters'.
+  - {servername: "local.dev", documentroot: "/var/www/html"}
diff --git a/vars/Debian.yml b/vars/Debian.yml
index e4e6e51..36313d9 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,14 +1,2 @@
 ---
-apache_daemon: apache2
-apache_server_root: /etc/apache2
-apache_conf_path: /etc/apache2/sites-enabled
-apache_packages:
-    - apache2
-    - apache2-mpm-prefork
-    - apache2-utils
-    - apache2.2-bin
-    - apache2.2-common
-apache_vhosts:
-  - {servername: "local.dev", documentroot: "/var/www"}
-apache_mods_enabled:
-  - rewrite.load
+# See defaults/Debian.yml
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 4dccbd6..dcaacd5 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,11 +1,2 @@
 ---
-apache_daemon: httpd
-apache_server_root: /etc/httpd
-apache_conf_path: /etc/httpd/conf.d
-apache_packages:
-  - httpd
-  - httpd-devel
-  - mod_ssl
-  - openssh
-apache_vhosts:
-  - {servername: "local.dev", documentroot: "/var/www/html"}
+# See defaults/RedHat.yml
diff --git a/vars/main.yml b/vars/main.yml
index 3388292..05e2673 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,10 +1,2 @@
 ---
-apache_enablerepo: ""
-
-apache_listen_port: 80
-
-apache_create_vhosts: true
-
-apache_vhosts:
-  # Additional properties: 'serveradmin, extra_parameters'.
-  - {servername: "local.dev", documentroot: "/var/www/html"}
+# See defaults/main.yml