nominatim: adapt updates to current load

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 4ed0a1e5ca962aa7509827655ea55cad779df891..f24e42e93b581540ce7c0d22da2055ff432d8313 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -32,14 +32,8 @@ directory "/srv/www.openstreetmap.org" do
   mode 0o2775
 end
 
   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
 rails_port "www.openstreetmap.org" do

-  ruby ruby_version
+  ruby "2.3"

   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"


@@ -53,11 +47,28 @@ rails_port "www.openstreetmap.org" do
   file_column_root "/store/rails"
 end
 
   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
   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"
   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
   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