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 c56843893029fcafd5c896a4a34fcd2c97cfe95a..29f75e3aee6ebdeee9cbe0be58d140e1675b1273 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,10 +1,6 @@
-default[:passenger][:version] = 5
-default[:passenger][:ruby_version] = "1.9.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][:instance_registry_dir] = "/run/passenger"
 
-if node[:passenger][:version] == 4
-  default[:apt][:sources] = node[:apt][:sources] |  ["brightbox-ruby-ng", "passenger4"]
-else
-  default[:apt][:sources] = node[:apt][:sources] |  ["brightbox-ruby-ng", "passenger"]
-end
+default[:apt][:sources] = node[:apt][:sources] | ["passenger"]