Introduce a node attribute for the ruby interpreter path

[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 f15bc0fe915b5223c753519049d5d6705169b1e2..5533f8deb01b2a00ae02612e9566d3060afc1d50 100644 (file)
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -2,10 +2,11 @@
 
 <IfModule mod_passenger.c>
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
 
 <IfModule mod_passenger.c>
   PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini

-  PassengerDefaultRuby /usr/bin/ruby
+  PassengerDefaultRuby <%= node[:ruby][:interpreter] %>

   PassengerRuby /usr/local/bin/passenger-ruby
   PassengerRuby /usr/local/bin/passenger-ruby

+  PassengerPreloadBundler on

   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
   PassengerFriendlyErrorPages off
   PassengerMaxPoolSize <%= node[:passenger][:max_pool_size] %>
   PassengerPoolIdleTime <%= node[:passenger][:pool_idle_time] %>
   PassengerFriendlyErrorPages off

-  PassengerInstanceRegistryDir /run/passenger
+  PassengerInstanceRegistryDir <%= node[:passenger][:instance_registry_dir] %>

 </IfModule>
 </IfModule>