summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:05:00 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:05:00 -0200
commit5f0d397d09478326f3891735acf75e4722c9ba35 (patch)
tree87a33a3551bcb4309787ccb384f45de832aab286
parent1c53f6c092dd344ed24125aac9590a6a8757f59f (diff)
downloadpuppet-puppet-5f0d397d09478326f3891735acf75e4722c9ba35.tar.gz
puppet-puppet-5f0d397d09478326f3891735acf75e4722c9ba35.tar.bz2
Adding puppet::master::passenger::disable_mongrel parameter
-rw-r--r--manifests/master/passenger.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
index 01f1dac..d14c2e7 100644
--- a/manifests/master/passenger.pp
+++ b/manifests/master/passenger.pp
@@ -1,7 +1,11 @@
# handles puppetmasterd service
class puppet::master::passenger {
- # make sure we're not running mongrel
- include puppet::master::mongrel::disabled
+ # Make sure we're not running mongrel
+ # Useful when migrating from mongrel to passenger
+ $disable_mongrel = hiera('puppet::master::passenger::disable_mongrel', false)
+ if $disable_mongrel == true {
+ include puppet::master::mongrel::disabled
+ }
# then include puppet class
include puppet::daemon