From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Jun 2018 16:27:57 +0000 (+0100)
Subject: Make passenger default to ruby 2.5 on 18.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/71aa04fbfad28e788b207a448efb8dd79a6347be?hp=90f2fc73653be3a0b86aa97cbc708b25c889d2af

Make passenger default to ruby 2.5 on 18.04
---

diff --git a/cookbooks/passenger/attributes/default.rb b/cookbooks/passenger/attributes/default.rb
index e21f96269..adb0edc08 100644
--- a/cookbooks/passenger/attributes/default.rb
+++ b/cookbooks/passenger/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:passenger][:ruby_version] = "2.3"
+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
 
diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb
index 841564bc3..fc50adc39 100644
--- a/roles/stormfly-01.rb
+++ b/roles/stormfly-01.rb
@@ -17,9 +17,6 @@ default_attributes(
         :address => "2605:bc80:3010:700::8cde:a768"
       }
     }
-  },
-  :passenger => {
-    :ruby_version => "2.5"
   }
 )