From 25f03a033b287d7c6a7b7622247803a070b6c269 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 14 Mar 2014 11:28:08 -0500
Subject: [PATCH] Remove EPEL repository dependency.

---
 README.md      | 8 ++++++--
 meta/main.yml  | 3 +--
 tasks/main.yml | 2 +-
 vars/main.yml  | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 525af23..4c02173 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Ansible Role: Apache 2.x
 
-An Ansible Role that installs Apache 2.x on RedHat Enterprise Linux or CentOS 6.x servers.
+An Ansible Role that installs Apache 2.x on RHEL/CentOS 6.x.
 
 ## Requirements
 
@@ -10,6 +10,10 @@ None.
 
 Available variables are listed below, along with default values (see `vars/main.yml`):
 
+    apache_enablerepo: ""
+
+The repository to use when installing Apache. If you'd like later versions of Apache than are available in the OS's core repositories, use a repository like EPEL (which can be installed with the `geerlingguy.repo-epel` role).
+
     apache_listen_port: 80
 
 The port on which apache should be listening. Useful if you have another service (like a reverse proxy) listening on port 80.
@@ -24,7 +28,7 @@ Note that this role doesn't configure SSL support out of the box; you would need
 
 ## Dependencies
 
-  - geerlingguy.repo-epel (Installs the EPEL repository for CentOS 6.x).
+None.
 
 ## Example Playbook
 
diff --git a/meta/main.yml b/meta/main.yml
index 151b92a..218915c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,5 @@
 ---
-dependencies:
-  - { role: geerlingguy.repo-epel }
+dependencies: []
 
 galaxy_info:
   author: geerlingguy
diff --git a/tasks/main.yml b/tasks/main.yml
index 7e40bee..5f8a052 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # Apache.
 - name: Install Apache.
-  yum: name={{ item }} state=installed enablerepo=epel
+  yum: name={{ item }} state=installed enablerepo={{ apache_enablerepo }}
   with_items:
     - httpd
     - httpd-devel
diff --git a/vars/main.yml b/vars/main.yml
index 4919d5c..58acd26 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,4 +1,5 @@
 ---
+apache_enablerepo: ""
 apache_listen_port: 80
 apache_vhosts:
   # Additional properties: 'serveradmin, extra_parameters'.