diff options
| author | Micah Anderson <micah@riseup.net> | 2013-10-18 17:00:31 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-10-18 17:00:31 -0400 |
| commit | a3ce74bd68f1535ea9c551212e72719edf110bab (patch) | |
| tree | be969c64cf79f66750084cefae33371c23a5ade5 | |
| parent | 7b371df17cd8ac9b17c537c0074c20645f3033ca (diff) | |
Revert "fix installation of ruby-passenger on non-squeeze hosts"
This reverts commit 232a921bbc52a4401ac892122b5b120249d104e1.
The actual apache module is still in libapache2-mod-passneger, and it depends on ruby-passenger.
Conflicts:
manifests/init.pp
| -rw-r--r-- | manifests/init.pp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5918f17..546024a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,16 +15,11 @@ class passenger ( { Class['::apache'] -> Class['passenger'] - $passenger_package = $::lsbdistcodename ? { - 'squeeze' => 'libapache2-mod-passenger', - default => 'ruby-passenger' - } - if ! $use_gems { apache::module { 'passenger': ensure => $passenger_ensure_version, - package_name => $passenger_package; + package_name => 'libapache2-mod-passenger'; } if !defined(Package['librack-ruby']) { |