Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index ee9d0089f65f13ce799b411def26b481414a9c0a..617392701f955f0c31a96f543be0683a4c72b447 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -17,13 +17,19 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "postgresql"
+include_recipe "accounts"

 include_recipe "git"
 include_recipe "git"

+include_recipe "postgresql"

 include_recipe "python"
 
 passwords = data_bag_item("db", "passwords")
 wal_secrets = data_bag_item("db", "wal-secrets")
 
 include_recipe "python"
 
 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"
 postgresql_munin "openstreetmap" do
   cluster node[:db][:cluster]
   database "openstreetmap"


@@ -31,16 +37,17 @@ end
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"

-  mode 0o2775
+  mode "2775"

 end
 
 rails_port "www.openstreetmap.org" do
 end
 
 rails_port "www.openstreetmap.org" do

-  ruby "2.5"
+  ruby ruby_version

   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
   repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
   repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"

+  build_assets false

   database_host "localhost"
   database_name "openstreetmap"
   database_username "openstreetmap"
   database_host "localhost"
   database_name "openstreetmap"
   database_username "openstreetmap"


@@ -48,19 +55,15 @@ rails_port "www.openstreetmap.org" do
   gpx_dir "/store/rails/gpx"
 end
 
   gpx_dir "/store/rails/gpx"
 end
 

-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"
 directory function_directory do
   owner "rails"
   group "rails"

-  mode 0o755
+  mode "755"

 end
 
 execute function_directory do
   action :nothing
 end
 
 execute function_directory do
   action :nothing

-  command "make PG_CONFIG=#{pg_config} DESTDIR=#{function_directory}"
+  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"
   cwd "/srv/www.openstreetmap.org/rails/db/functions"
   user "rails"
   group "rails"


@@ -74,6 +77,58 @@ link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do
   group "root"
 end
 
   group "root"
 end
 

+package %w[
+  cmake
+  libosmium2-dev
+  libprotozero-dev
+  libboost-filesystem-dev
+  libboost-program-options-dev
+  libbz2-dev
+  zlib1g-dev
+  libexpat1-dev
+  libyaml-cpp-dev
+  libpqxx-dev
+]
+
+git "/opt/osmdbt" do
+  action :sync
+  repository "https://github.com/openstreetmap/osmdbt.git"
+  revision "v0.2"
+  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"
+end
+

 package "lzop"
 
 python_package "wal-e" do
 package "lzop"
 
 python_package "wal-e" do


@@ -88,6 +143,6 @@ template "/usr/local/bin/openstreetmap-wal-e" do
   source "wal-e.erb"
   owner "root"
   group "postgres"
   source "wal-e.erb"
   owner "root"
   group "postgres"

-  mode 0o750
+  mode "750"

   variables :s3_key => wal_secrets["s3_key"]
 end
   variables :s3_key => wal_secrets["s3_key"]
 end