Use ruby 2.3 on Ubuntu 16.04 database servers

[chef.git] / cookbooks / db / recipes / base.rb

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 3f99204872f92adfb665a5c23d1ed2d8bc528dc7..4ed0a1e5ca962aa7509827655ea55cad779df891 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -29,10 +29,17 @@ end
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"
-  mode 02775
+  mode 0o2775
 end
 
+ruby_version = if node[:lsb][:release].to_f >= 16.04
+                 "2.3"
+               else
+                 "2.1"
+               end
+
 rails_port "www.openstreetmap.org" do
+  ruby ruby_version
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
@@ -52,5 +59,5 @@ execute "/srv/www.openstreetmap.org/rails/db/functions/Makefile" do
   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"
-  subscribes :run, resources(:git => "/srv/www.openstreetmap.org/rails")
+  subscribes :run, "git[/srv/www.openstreetmap.org/rails]"
 end