nftables: allow 169.254.169.0/24 and set log level to notice

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index 520fbe2e86ab1c84a547a3fd209bcc147cf67b15..b25fbdbb2f22f539fae8e8952f809f27f3b4e3e5 100644 (file)
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -23,43 +23,21 @@ 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
-
-directory "/srv/www.openstreetmap.org" do
-  group "rails"
-  mode "2775"
-end
-
-rails_port "www.openstreetmap.org" do
-  directory "/srv/www.openstreetmap.org/rails"
-  user "rails"
-  group "rails"
-  repository "https://git.openstreetmap.org/public/rails.git"
-  revision "live"
-  build_assets false
-  database_host "localhost"
-  database_name "openstreetmap"
-  database_username "openstreetmap"
-  database_password passwords["openstreetmap"]
-end
-
 package %w[
   cmake
-  libosmium2-dev
-  libprotozero-dev
+  g++
   libboost-filesystem-dev
   libboost-program-options-dev
   libbz2-dev
-  zlib1g-dev
   libexpat1-dev
-  libyaml-cpp-dev
+  libosmium2-dev
   libpqxx-dev
+  libprotozero-dev
+  libyaml-cpp-dev
+  make
+  zlib1g-dev
 ]
 
 git "/opt/osmdbt" do
@@ -72,31 +50,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,25 +84,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"