X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c33f2b7dc097a2d5c2f3582d4f3b747b9fa10ca8..d4db2d890308157f77aa84154ef18fffeb8c61f0:/cookbooks/db/recipes/base.rb?ds=sidebyside diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index c8a2dfcce..6efbde328 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -21,12 +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] - postgresql_munin "openstreetmap" do cluster node[:db][:cluster] database "openstreetmap" @@ -38,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" @@ -67,38 +65,13 @@ package %w[ git "/opt/osmdbt" do action :sync repository "https://github.com/openstreetmap/osmdbt.git" - revision "v0.2" + revision "v0.5" depth 1 user "root" group "root" end 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=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 - directory "/opt/osmdbt/build-#{db_version}" do owner "root" group "root" @@ -133,25 +106,9 @@ end package "lzop" -python_package "wal-e" do - python_version "3" -end - -python_package "boto" do - python_version "3" -end - -template "/usr/local/bin/openstreetmap-wal-e" do - source "wal-e.erb" - owner "root" - group "postgres" - 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" + 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"