X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..6e1c597ea720a3a3eb315f6a94588aeb08411f31:/cookbooks/db/recipes/base.rb diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index 520fbe2e8..f19b1d03a 100644 --- a/cookbooks/db/recipes/base.rb +++ b/cookbooks/db/recipes/base.rb @@ -72,31 +72,6 @@ git "/opt/osmdbt" do 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=#{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" @@ -131,22 +106,6 @@ 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"