Make passenger default to ruby 2.5 on 18.04

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

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index 9af69741f1e0f3714b1ee51deaed211a533b7f9c..adb0edc081e3155bb5293566cc6554d21b4f42ca 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,10 +1,5 @@
-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
 
-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"]