summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp47
1 files changed, 19 insertions, 28 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index cc2e07d..d4132d3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,46 +7,37 @@
# it under the terms of the GNU General Public License version 3 as
# published by the Free Software Foundation.
-class passenger ( $use_gems = false, $use_munin = true )
+class passenger (
+ $use_gems = false, $use_munin = true,
+ $passenger_ensure_version = 'installed',
+ $librack_ensure_version = 'installed' )
{
- if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' }
- if $librack_ensure_version == '' { $librack_ensure_version = 'installed' }
-
- if $use_gems {
- package {
- "passenger":
- provider => gem,
- ensure => $passenger_ensure_version;
+ if ! $use_gems {
+ class { 'apache::module':
+ module => 'passenger',
+ ensure => $passenger_ensure_version,
+ package_name => 'libapache2-mod-passenger';
}
- if !defined(Package["rack"]) {
+
+ if !defined(Package["librack-ruby"]) {
package {
- "rack":
- provider => gem,
+ [ "librack-ruby", "librack-ruby1.8"] :
ensure => $librack_ensure_version;
}
}
}
else {
- if !defined(Package["libapache2-mod-passenger"]) {
- package {
- "libapache2-mod-passenger":
- alias => 'passenger',
- ensure => $passenger_ensure_version;
- }
- }
- if !defined(Package["librack-ruby"]) {
- package {
- [ "librack-ruby", "librack-ruby1.8"] :
- ensure => $librack_ensure_version;
- }
+ package {
+ "passenger":
+ provider => gem,
+ ensure => $passenger_ensure_version;
+ "rack":
+ provider => gem,
+ ensure => $librack_ensure_version;
}
}
- apache2::module {
- "passenger": ensure => present, require_package => "passenger";
- }
-
if $use_munin {
case $passenger_memory_munin_config { '':
{ $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" }