X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eecaf26698348adf3d3b64ea680ad82f959a5ae4..f6f2f9e52a1f7c2c13027779da1a3b7f49ff2763:/cookbooks/db/recipes/base.rb

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 7bdf7cb02..520fbe2e8 100644
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -21,15 +21,11 @@ include_recipe "accounts"
 include_recipe "git"
 include_recipe "postgresql"
 include_recipe "python"
+include_recipe "ruby"
 
 passwords = data_bag_item("db", "passwords")
 wal_secrets = data_bag_item("db", "wal-secrets")
 
-ruby_version = node[:passenger][:ruby_version]
-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}"
-
 postgresql_munin "openstreetmap" do
   cluster node[:db][:cluster]
   database "openstreetmap"
@@ -41,7 +37,6 @@ directory "/srv/www.openstreetmap.org" do
 end
 
 rails_port "www.openstreetmap.org" do
-  ruby ruby_version
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
@@ -52,29 +47,6 @@ rails_port "www.openstreetmap.org" do
   database_name "openstreetmap"
   database_username "openstreetmap"
   database_password passwords["openstreetmap"]
-  gpx_dir "/store/rails/gpx"
-end
-
-directory function_directory do
-  owner "rails"
-  group "rails"
-  mode "755"
-end
-
-execute function_directory do
-  action :nothing
-  command "make BUNDLE=bundle#{ruby_version} 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
 
 package %w[
@@ -93,40 +65,68 @@ package %w[
 git "/opt/osmdbt" do
   action :sync
   repository "https://github.com/openstreetmap/osmdbt.git"
-  revision "master"
+  revision "v0.5"
   depth 1
   user "root"
   group "root"
 end
 
-directory "/opt/osmdbt/build-#{db_version}" do
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-execute "/opt/osmdbt/CMakeLists.txt" do
-  action :nothing
-  command "cmake -DPG_CONFIG=/usr/lib/postgresql/#{db_version}/bin/pg_config .."
-  cwd "/opt/osmdbt/build-#{db_version}"
-  user "root"
-  group "root"
-  subscribes :run, "git[/opt/osmdbt]"
-end
-
-execute "/opt/osmdbt/build-#{db_version}/postgresql-plugin/Makefile" do
-  action :nothing
-  command "make"
-  cwd "/opt/osmdbt/build-#{db_version}/postgresql-plugin"
-  user "root"
-  group "root"
-  subscribes :run, "execute[/opt/osmdbt/CMakeLists.txt]"
-end
-
-link "/usr/lib/postgresql/#{db_version}/lib/osm-logical.so" do
-  to "/opt/osmdbt/build-#{db_version}/postgresql-plugin/osm-logical.so"
-  owner "root"
-  group "root"
+node[:postgresql][:versions].each do |db_version|
+  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 "755"
+  end
+
+  execute function_directory do
+    action :nothing
+    command "make BUNDLE=#{node[:ruby][:bundle]} 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
+
+  directory "/opt/osmdbt/build-#{db_version}" do
+    owner "root"
+    group "root"
+    mode "755"
+  end
+
+  execute "/opt/osmdbt/build-#{db_version}" do
+    action :nothing
+    command "cmake -DPG_CONFIG=/usr/lib/postgresql/#{db_version}/bin/pg_config .."
+    cwd "/opt/osmdbt/build-#{db_version}"
+    user "root"
+    group "root"
+    subscribes :run, "directory[/opt/osmdbt/build-#{db_version}]"
+    subscribes :run, "git[/opt/osmdbt]"
+  end
+
+  execute "/opt/osmdbt/build-#{db_version}/postgresql-plugin/Makefile" do
+    action :nothing
+    command "make"
+    cwd "/opt/osmdbt/build-#{db_version}/postgresql-plugin"
+    user "root"
+    group "root"
+    subscribes :run, "execute[/opt/osmdbt/build-#{db_version}]"
+  end
+
+  link "/usr/lib/postgresql/#{db_version}/lib/osm-logical.so" do
+    to "/opt/osmdbt/build-#{db_version}/postgresql-plugin/osm-logical.so"
+    owner "root"
+    group "root"
+  end
 end
 
 package "lzop"
@@ -146,3 +146,19 @@ template "/usr/local/bin/openstreetmap-wal-e" do
   mode "750"
   variables :s3_key => wal_secrets["s3_key"]
 end
+
+remote_file "/usr/local/bin/wal-g" do
+  action :create
+  source "https://github.com/wal-g/wal-g/releases/download/v1.1/wal-g-pg-ubuntu-20.04-amd64"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+template "/usr/local/bin/openstreetmap-wal-g" do
+  source "wal-g.erb"
+  owner "root"
+  group "postgres"
+  mode "750"
+  variables :s3_key => wal_secrets["s3_key"]
+end