From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 19:05:00 +0000 (-0200)
Subject: Adding puppet::master::passenger::disable_mongrel parameter
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5f0d397d09478326f3891735acf75e4722c9ba35;p=puppet-puppet.git

Adding puppet::master::passenger::disable_mongrel parameter
---

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