Use upstream default location for passenger instance registry

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index 1540a8592e58cc6e37204cb3ff20fdd7d2b176fb..2c11cc27aae37cbfd7c0967c97f43ded37674ec0 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,3 +1,3 @@
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300
 default[:passenger][:max_pool_size] = 6
 default[:passenger][:pool_idle_time] = 300

-default[:passenger][:instance_registry_dir] = "/run/passenger"
+default[:passenger][:instance_registry_dir] = "/run/passenger-instreg"

diff --git a/cookbooks/passenger/templates/default/passenger.conf.erb b/cookbooks/passenger/templates/default/passenger.conf.erb
index f15bc0fe915b5223c753519049d5d6705169b1e2..1212f75882d096de2a8e09651eb62d179a71913d 100644 (file)
--- a/cookbooks/passenger/templates/default/passenger.conf.erb
+++ b/cookbooks/passenger/templates/default/passenger.conf.erb
@@ -7,5 +7,5 @@
   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>