Merge remote-tracking branch 'leap/master'

2 files changed, 19 insertions, 6 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:
diff --git a/manifests/init.pp b/manifests/init.pp
index 015de90..a5d5ea4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,11 +20,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;
+        }
       }
     }
   }