Use ruby 2.7 on Ubuntu 20.04

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

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index a67ac6a0460fa0b8d5832d1f91c104bc34cbebc6..1c1b0c6fb43b18137583677ba88fe40658f78a4e 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,5 +1,11 @@
-default[:apt][:sources] = node[:apt][:sources] |  [ "brightbox-ruby-ng", "passenger" ]
+if node[:lsb][:release].to_f < 20.04
+  default[:passenger][:ruby_version] = "2.5"
+else
+  default[:passenger][:ruby_version] = "2.7"
+end
 
-default[:passenger][:ruby_version] = "1.9.1"
 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] | ["passenger"]