From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Jul 2014 19:16:45 +0000 (+0100)
Subject: PassengerUseGlobalQueue defaults to on with passenger 4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b0cff008c5d80c4c80b5bdba555d27f6c048932d

PassengerUseGlobalQueue defaults to on with passenger 4
---

diff --git a/cookbooks/passenger/templates/default/passenger.conf.erb b/cookbooks/passenger/templates/default/passenger.conf.erb
index 7db2728b7..002394f2e 100644
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -8,7 +8,9 @@
   PassengerRoot /usr
 <% end -%>
   PassengerRuby /usr/local/bin/passenger-ruby
+<% if node[:passenger][:version] < "4" -%>
   PassengerUseGlobalQueue on
+<% end -%>
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
 </IfModule>