X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/67dd81a83b573132e0423134ab5dfbbde7da71e3..5e01e28d3970940f3be03d7bfa514373175caad8:/cookbooks/db/recipes/base.rb?ds=inline diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 2a509f130..b25fbdbb2 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: db +# Cookbook:: db # Recipe:: base # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,77 +17,85 @@ # limitations under the License. # -include_recipe "postgresql" +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") -postgresql_munin "openstreetmap" do - cluster node[:db][:cluster] - database "openstreetmap" -end +package %w[ + cmake + g++ + libboost-filesystem-dev + libboost-program-options-dev + libbz2-dev + libexpat1-dev + libosmium2-dev + libpqxx-dev + libprotozero-dev + libyaml-cpp-dev + make + zlib1g-dev +] -directory "/srv/www.openstreetmap.org" do - group "rails" - mode 0o2775 -end - -rails_port "www.openstreetmap.org" do - ruby "2.3" - directory "/srv/www.openstreetmap.org/rails" - user "rails" - group "rails" - repository "https://git.openstreetmap.org/public/rails.git" - revision "live" - database_host "localhost" - database_name "openstreetmap" - database_username "openstreetmap" - database_password passwords["openstreetmap"] - gpx_dir "/store/rails/gpx" +git "/opt/osmdbt" do + action :sync + repository "https://github.com/openstreetmap/osmdbt.git" + revision "v0.5" + depth 1 + user "root" + group "root" 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}" +node[:postgresql][:versions].each do |db_version| + directory "/opt/osmdbt/build-#{db_version}" do + owner "root" + group "root" + mode "755" + end -directory function_directory do - owner "rails" - group "rails" - mode 0o755 -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 function_directory do - action :nothing - 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 + 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/libpgosm.so" do - to "#{function_directory}/libpgosm.so" - owner "root" - group "root" + 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" -python_package "wal-e" do - python_version "3" -end - -python_package "boto" do - python_version "3" +remote_file "/usr/local/bin/wal-g" do + action :create + source "https://github.com/wal-g/wal-g/releases/download/v2.0.1/wal-g-pg-ubuntu-20.04-amd64" + owner "root" + group "root" + mode "755" end -template "/usr/local/bin/openstreetmap-wal-e" do - source "wal-e.erb" +template "/usr/local/bin/openstreetmap-wal-g" do + source "wal-g.erb" owner "root" group "postgres" - mode 0o750 + mode "750" variables :s3_key => wal_secrets["s3_key"] end