Install make and g+ for osmdbt

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

diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index f19b1d03a65c8768fd0c35b5d967f9af8ba435c1..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"
 
 include_recipe "python"
 include_recipe "ruby"
 

-passwords = data_bag_item("db", "passwords")

 wal_secrets = data_bag_item("db", "wal-secrets")
 
 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
 package %w[
   cmake

-  libosmium2-dev
-  libprotozero-dev
+  g++

   libboost-filesystem-dev
   libboost-program-options-dev
   libbz2-dev
   libboost-filesystem-dev
   libboost-program-options-dev
   libbz2-dev

-  zlib1g-dev

   libexpat1-dev
   libexpat1-dev

-  libyaml-cpp-dev
+  libosmium2-dev

   libpqxx-dev
   libpqxx-dev

+  libprotozero-dev
+  libyaml-cpp-dev
+  make
+  zlib1g-dev

 ]
 
 git "/opt/osmdbt" do
 ]
 
 git "/opt/osmdbt" do


@@ -108,7 +86,7 @@ package "lzop"
 
 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"