Permalink
Browse files

Reorder and remove unnecessary dependencies

Previously, the resource chaining syntax was being used to order
resources. This has been removed in favor of using metaprameters
and the require function.
  • Loading branch information...
1 parent 3057f93 commit 26134ddde5337679df3f19d65cf28eb66ac1eb0b @glarizza glarizza committed May 13, 2012
Showing with 4 additions and 10 deletions.
  1. +1 −2 Modulefile
  2. +3 −8 manifests/init.pp
View
@@ -1,5 +1,5 @@
name 'puppetlabs-passenger'
-version '0.0.3'
+version '0.0.4'
source 'git://github.com/puppetlabs/puppetlabs-passenger.git'
author 'puppetlabs'
license 'Apache 2.0'
@@ -8,5 +8,4 @@ description 'Module for Passenger configuration'
project_page 'https://github.com/puppetlabs/puppetlabs-passenger'
dependency 'puppetlabs/apache', '>= 0.0.3'
-dependency 'puppetlabs/gcc', '>= 0.0.1'
dependency 'puppetlabs/ruby', '>= 0.0.1'
View
@@ -35,7 +35,6 @@
#
#
# Requires:
-# - gcc
# - apache
# - apache::dev
#
@@ -48,12 +47,14 @@
$passenger_package = $passenger::params::passenger_package
) inherits passenger::params {
- require gcc, apache, apache::dev
+ include apache
+ require apache::dev
case $osfamily {
'debian': {
package { ['libopenssl-ruby', 'libcurl4-openssl-dev']:
ensure => present,
+ before => Exec['compile-passenger'],
}
file { '/etc/apache2/mods-available/passenger.load':
@@ -117,10 +118,4 @@
creates => $mod_passenger_location,
require => Package['passenger'],
}
-
- Class ['gcc']
- -> Class['apache::dev']
- -> Package <| title == 'rubygems' |>
- -> Package['passenger']
- -> Exec['compile-passenger']
}

0 comments on commit 26134dd

Please sign in to comment.