imagery: fixup add dummy us_capcog.rb

[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 002394f2eac3d6e9ccb3cacccef5947a486a533a..1212f75882d096de2a8e09651eb62d179a71913d 100644 (file)
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -1,16 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <IfModule mod_passenger.c>
 # 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
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
   PassengerDefaultRuby /usr/bin/ruby

-<% else -%>
-  PassengerRoot /usr
-<% end -%>

   PassengerRuby /usr/local/bin/passenger-ruby
   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] %>
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>

+  PassengerFriendlyErrorPages off
+  PassengerInstanceRegistryDir <%= node[:passenger][:instance_registry_dir] %>

 </IfModule>
 </IfModule>