Revert "Use --ignore-engines when installing node modules with yarn"

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

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index 56816eac7b54f41cb302d18b85d941854b807739..03c6b5a8d13ab44068c0a049089f4003b758b410 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,5 +1,11 @@
-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][: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"]