Remove forced downgrade of hp-health

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index d032fb64eabecd1321f234b8cae919e1c8073b30..92d74f86dcda82fbbb5a5bd5745c16e94cdeb0e2 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -19,8 +19,10 @@
 
 include_recipe "postgresql"
 include_recipe "git"
+include_recipe "python"
 
 passwords = data_bag_item("db", "passwords")
+wal_secrets = data_bag_item("db", "wal-secrets")
 
 postgresql_munin "openstreetmap" do
   cluster node[:db][:cluster]
@@ -29,11 +31,11 @@ end
 
 directory "/srv/www.openstreetmap.org" do
   group "rails"
-  mode 02775
+  mode 0o2775
 end
 
 rails_port "www.openstreetmap.org" do
-  ruby "2.1"
+  ruby "2.3"
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
@@ -47,11 +49,46 @@ rails_port "www.openstreetmap.org" do
   file_column_root "/store/rails"
 end
 
-execute "/srv/www.openstreetmap.org/rails/db/functions/Makefile" do
+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"
+  mode 0o755
+end
+
+execute function_directory do
   action :nothing
-  command "make"
+  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
+
+link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do
+  to "#{function_directory}/libpgosm.so"
+  owner "root"
+  group "root"
+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 0o750
+  variables :s3_key => wal_secrets["s3_key"]
+end