nominatim: extend WAL archive delete script to check slave delay

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

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 88b9cf6fa49e3c85749c12575570525703c1d5f8..2e6a8c12550cb6d34e6c62e399bba4b2a7c75c1a 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apache::ssl"
 include_recipe "postgresql"
-include_recipe "git"
 
 package "php5"
 package "php5-cli"
@@ -71,6 +70,12 @@ directory "/var/log/nominatim" do
   mode 0755
 end
 
+directory "#{home_directory}/status" do
+  owner "nominatim"
+  group "postgres"
+  mode 0775
+end
+
 template "/etc/logrotate.d/nominatim" do
   source "logrotate.nominatim.erb"
   owner "root"
@@ -222,7 +227,7 @@ external_data.each do |fname|
   end
 end
 
-additional_scripts = %w(backup-nominatim clean-db-nominatim)
+additional_scripts = %w(backup-nominatim vacuum-db-nominatim)
 
 additional_scripts.each do |fname|
   template "/usr/local/bin/#{fname}" do
@@ -240,13 +245,6 @@ directory File.dirname(node[:nominatim][:flatnode_file]) do
   recursive true
 end
 
-directory "/data/postgresql-archive" do
-  owner "postgres"
-  group "postgres"
-  mode 0700
-  only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
-end
-
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory source_directory