Merge remote-tracking branch 'github/pull/165'

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

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index a67ac6a0460fa0b8d5832d1f91c104bc34cbebc6..adb0edc081e3155bb5293566cc6554d21b4f42ca 100644 (file)
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,5 +1,5 @@
-default[:apt][:sources] = node[:apt][:sources] |  [ "brightbox-ruby-ng", "passenger" ]
-
-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[:apt][:sources] = node[:apt][:sources] | ["passenger"]