Update default SSL cipher list and remove tilecache override

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index d032fb64eabecd1321f234b8cae919e1c8073b30..ae0b2160458a30833722f7343b8fa9be46dd056f 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -29,11 +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 "2.1"
+  ruby ruby_version
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
@@ -47,11 +53,28 @@ rails_port "www.openstreetmap.org" do
   file_column_root "/store/rails"
 end
 
-execute "/srv/www.openstreetmap.org/rails/db/functions/Makefile" do
+db_version = node[:db][:cluster].split("/").first
+pg_config = "/usr/lib/postgresql/#{db_version}/bin/pg_config"
+function_directory = "/srv/www.openstreetmap.org/rails/db/functions/#{db_version}"
+
+directory function_directory do
+  owner "rails"
+  group "rails"
+  mode 0o755
+end
+
+execute function_directory do
   action :nothing
-  command "make"
+  command "make PG_CONFIG=#{pg_config} DESTDIR=#{function_directory}"
   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"
+  subscribes :run, "directory[#{function_directory}]"
   subscribes :run, "git[/srv/www.openstreetmap.org/rails]"
 end
+
+link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do
+  to "#{function_directory}/libpgosm.so"
+  owner "root"
+  group "root"
+end