Skip to content

Commit

Permalink
Remove puppetlabs/apache dependency
Browse files Browse the repository at this point in the history
Must be install manually when using the passenger module
  • Loading branch information
Carlos Sanchez committed Mar 6, 2014
1 parent abb2c4a commit 93c0544
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Modulefile
Original file line number Diff line number Diff line change
@@ -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>'
Expand All @@ -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'
3 changes: 2 additions & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
forge 'http://forge.puppetlabs.com'

mod 'puppetlabs/stdlib', '>=3.2.0'
modulefile

mod 'puppetlabs/apache', '>=0.9.0'
1 change: 1 addition & 0 deletions Puppetfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)

7 changes: 7 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:

Expand Down

0 comments on commit 93c0544

Please sign in to comment.