summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-05-03 11:43:43 -0400
committerMicah Anderson <micah@riseup.net>2013-05-03 11:43:43 -0400
commit1103f959b994da506adc07f30def7be505fc5500 (patch)
treebed538451c653dfc2f7611c4d5d789c24fe65ae5 /manifests
parent071b797a51a13a76d4240b6e7c116eda5a19074a (diff)
parentd1b46de84acf4d9e3582b64e019935fb1125f9bb (diff)
Merge remote-tracking branch 'leap/master'
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp10
1 files changed, 7 insertions, 3 deletions
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;
+ }
}
}
}