Switch culebre, fafnir, ladon and trogdor to squid 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 7db2728b7795acae5158ff4c35e8d52f11c28d46..f15bc0fe915b5223c753519049d5d6705169b1e2 100644 (file)
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -1,14 +1,11 @@
 # 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
-  PassengerUseGlobalQueue on
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
+  PassengerFriendlyErrorPages off
+  PassengerInstanceRegistryDir /run/passenger
 </IfModule>