PassengerUseGlobalQueue defaults to on with passenger 4

[chef.git] / cookbooks / passenger / templates / default / passenger.conf.erb

diff --git a/cookbooks/passenger/templates/default/passenger.conf.erb b/cookbooks/passenger/templates/default/passenger.conf.erb
index a234b15a2ca7c5a393c5d89552e7bab880046fc9..002394f2eac3d6e9ccb3cacccef5947a486a533a 100644 (file)
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -1,9 +1,16 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <IfModule mod_passenger.c>
+<% if node[:passenger][:version] >= "4" -%>
+  PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+  PassengerDefaultRuby /usr/bin/ruby
+<% else -%>
   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>