summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-04-09 17:59:24 -0400
committerMicah Anderson <micah@riseup.net>2012-04-09 17:59:24 -0400
commit6c4272cf5dbaf2baacad6e175e70fb00b9307e91 (patch)
tree07ed9013e2e4f1b527b1e6d97ea7eb0cf5d3d6c7
parent69370cff75724e51f9f6c2068ea05bbd84dec8d1 (diff)
fix logic for $use_gems
-rw-r--r--manifests/init.pp30
1 files changed, 15 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 4082ef1..cc2e07d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,7 +13,21 @@ class passenger ( $use_gems = false, $use_munin = true )
if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' }
if $librack_ensure_version == '' { $librack_ensure_version = 'installed' }
- if !$use_gems {
+ if $use_gems {
+ package {
+ "passenger":
+ provider => gem,
+ ensure => $passenger_ensure_version;
+ }
+ if !defined(Package["rack"]) {
+ package {
+ "rack":
+ provider => gem,
+ ensure => $librack_ensure_version;
+ }
+ }
+ }
+ else {
if !defined(Package["libapache2-mod-passenger"]) {
package {
"libapache2-mod-passenger":
@@ -27,20 +41,6 @@ class passenger ( $use_gems = false, $use_munin = true )
ensure => $librack_ensure_version;
}
}
- else {
- package {
- "passenger":
- provider => gem,
- ensure => $passenger_ensure_version;
- }
- if !defined(Package["rack"]) {
- package {
- "rack":
- provider => gem,
- ensure => $librack_ensure_version;
- }
- }
- }
}
apache2::module {