Reduce connection timeout for outgoing SMTP connections

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

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index 9af69741f1e0f3714b1ee51deaed211a533b7f9c..03c6b5a8d13ab44068c0a049089f4003b758b410 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,10 +1,11 @@
-default[:passenger][:version] = 5
-default[:passenger][:ruby_version] = "1.9.1"
+default[:passenger][:ruby_version] = if node[:lsb][:release].to_f < 20.04
+                                       "2.5"
+                                     else
+                                       "2.7"
+                                     end
+
 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"]