X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5dbcbc9fc104320252388249ad1fbb9984bb5339..847ffefc0606eae909ccc4abe752fa1629085011:/cookbooks/db/recipes/base.rb diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb index ae0b21604..92d74f86d 100644 --- 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] @@ -32,14 +34,8 @@ directory "/srv/www.openstreetmap.org" do mode 0o2775 end -ruby_version = if node[:lsb][:release].to_f >= 16.04 - "2.3" - else - "2.1" - end - rails_port "www.openstreetmap.org" do - ruby ruby_version + ruby "2.3" directory "/srv/www.openstreetmap.org/rails" user "rails" group "rails" @@ -78,3 +74,21 @@ link "/usr/lib/postgresql/#{db_version}/lib/libpgosm.so" do 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