From c762d1c7a018d6e068b9b405a14aaf644777ff4d Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 26 Nov 2012 15:23:12 -0500 Subject: on newer debian systems, the package name for rack is 'ruby-rack' so this adds a check to see if you are still on squeeze or not, otherwise it will use the new name --- manifests/init.pp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index ffeeb7d..f35c188 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,11 +18,15 @@ class passenger ( ensure => $passenger_ensure_version, package_name => 'libapache2-mod-passenger'; } - + if !defined(Package["librack-ruby"]) { - package { - [ "librack-ruby", "librack-ruby1.8"] : + if $::lsbdistcodename == 'squeeze' { + package { 'librack-ruby1.8': ensure => $librack_ensure_version } + } + else { + package { 'ruby-rack': ensure => $librack_ensure_version; + } } } } -- cgit v1.2.3 From d1b46de84acf4d9e3582b64e019935fb1125f9bb Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 26 Nov 2012 15:23:42 -0500 Subject: update README to be more current: adds parameterized class information, makes it clear that the munin module is optional --- README | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/README b/README index 7014d6f..549432e 100644 --- a/README +++ b/README @@ -8,9 +8,11 @@ Dependencies ------------ This module expects you to have: - . munin module . apache module +Optional: + . munin module + Getting started --------------- @@ -23,8 +25,15 @@ If you need to install a specific version of passenger or librack-ruby, you can specify the version to be installed by providing a variable, for example: -$passenger_ensure_version = "2.2.3-2~bpo50+1" -$librack-ruby_ensure_version = "1.0.0-2~bpo50+1" +class { 'passenger': + passenger_ensure_version => '2.2.23-2~bpo50+1', + librack-ruby_ensure_version = "1.0.0-2~bpo50+1" +} + +If you wish to use gems, pass 'use_gems => true'. + +By default munin will be used, but you can disable that by passing +'use_munin => false'. If you need to set different munin plugin configuration values, you can also do so as follows: -- cgit v1.2.3