Centralise enablement of backports

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index bf414737c1a2cf52bba763b13683452d0d54da6d..d989d0bc91dd5f3bd16eb19b4a768a2c0aad16fd 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -26,11 +26,6 @@ include_recipe "ruby"
 passwords = data_bag_item("db", "passwords")
 wal_secrets = data_bag_item("db", "wal-secrets")
 
 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
-

 directory "/srv/www.openstreetmap.org" do
   group "rails"
   mode "2775"
 directory "/srv/www.openstreetmap.org" do
   group "rails"
   mode "2775"


@@ -106,25 +101,9 @@ end
 
 package "lzop"
 
 
 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
 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"
   owner "root"
   group "root"
   mode "755"