From 93c0544f5b501a8f157fb6c0c985df16ef67689a Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <csanchez@maestrodev.com>
Date: Wed, 5 Mar 2014 19:31:08 +0100
Subject: [PATCH] Remove puppetlabs/apache dependency

Must be install manually when using the passenger module
---
 Modulefile      | 5 +++--
 Puppetfile      | 3 ++-
 Puppetfile.lock | 1 +
 README.markdown | 7 +++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Modulefile b/Modulefile
index 84cc5338..f15d047b 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name 'maestrodev-rvm'
-version '1.4.5'
+version '1.5.0'
 
 summary 'A puppet module for installing and using RVM (Ruby Version Manager)'
 author 'maestrodev & Brandon Turner <bt@brandonturner.net>'
@@ -9,4 +9,5 @@ source 'http://github.com/maestrodev/puppet-rvm'
 description 'Installing and using RVM (Ruby Version Manager)'
 
 dependency 'puppetlabs/stdlib', '>=3.2.0'
-dependency 'puppetlabs/apache', '>=0.9.0'
+# not included as a dependency to avoid installing it when is not needed most times.
+#dependency 'puppetlabs/apache', '>=0.9.0'
diff --git a/Puppetfile b/Puppetfile
index 60f69c2c..329dba30 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,4 +1,5 @@
 forge 'http://forge.puppetlabs.com'
 
-mod 'puppetlabs/stdlib',   '>=3.2.0'
+modulefile
+
 mod 'puppetlabs/apache',   '>=0.9.0'
diff --git a/Puppetfile.lock b/Puppetfile.lock
index e30cf369..0565b2ce 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -8,6 +8,7 @@ FORGE
     puppetlabs/stdlib (4.1.0)
 
 DEPENDENCIES
+  puppetlabs/apache (>= 0.9.0)
   puppetlabs/apache (>= 0.9.0)
   puppetlabs/stdlib (>= 3.2.0)
 
diff --git a/README.markdown b/README.markdown
index 36536731..986b85a0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -20,6 +20,10 @@ Please read the troubleshooting section below before opening an issue.
 
 Puppet 3.0.0 or higher.
 
+## Upgrading
+
+Version 1.5 no longer includes a dependency on puppetlabs/apache, you must install it yourself
+if you want to use the passenger module.
 
 ## Add Puppet Module
 
@@ -155,6 +159,9 @@ To create an RVM wrapper, you can use:
 
 ## Installing Passenger
 
+NOTE: You must install the [puppetlabs/apache](http://forge.puppetlabs.com/puppetlabs/apache) module by yourself.
+It is not included as a dependency to this module to avoid installing it when is not needed most times.
+
 Install passenger using the [puppetlabs/apache](http://forge.puppetlabs.com/puppetlabs/apache) module,
 and using: