Don't try and restart passenger on machines that don't have it

[chef.git] / cookbooks / passenger / attributes / default.rb

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index e9a517c3f53576c623911237830b44f2962653f0..29f75e3aee6ebdeee9cbe0be58d140e1675b1273 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,5 +1,6 @@
-default[:passenger][:ruby_version] = "2.1"
+default[:passenger][:ruby_version] = node[:lsb][:release].to_f >= 18.04 ? "2.5" : "2.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[:apt][:sources] = node[:apt][:sources] | ["brightbox-ruby-ng", "passenger"]
+default[:apt][:sources] = node[:apt][:sources] | ["passenger"]