From eda0faa323426615b78375067a62aecd41b9b5af Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 4 Jun 2014 08:35:02 +0100 Subject: [PATCH] Disable nominatim cron jobs on pummelzacken for now --- cookbooks/nominatim/recipes/default.rb | 10 ++++++++++ roles/nominatim.rb | 1 + roles/pummelzacken.rb | 1 + 3 files changed, 12 insertions(+) diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 0a0640fd8..bca915d91 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -198,7 +198,14 @@ file "#{source_directory}/settings/ip_blocks.map" do mode 0664 end +if node[:nominatim][:enabled] + cron_action = :create +else + cron_action = :delete +end + cron "nominatim_logrotate" do + action cron_action hour "5" minute "30" weekday "0" @@ -208,12 +215,14 @@ cron "nominatim_logrotate" do end cron "nominatim_banip" do + action cron_action command "#{source_directory}/utils/cron_banip.py" user "nominatim" mailto email_errors end cron "nominatim_vacuum" do + action cron_action hour "2" minute "00" command "#{source_directory}/utils/cron_vacuum.sh" @@ -274,6 +283,7 @@ template "/usr/local/bin/backup-nominatim" do end cron "nominatim_backup" do + action cron_action hour "3" minute "00" day "1" diff --git a/roles/nominatim.rb b/roles/nominatim.rb index e26882dc6..1c6201472 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -51,6 +51,7 @@ default_attributes( } }, :nominatim => { + :enabled => true, :repository => "git://git.openstreetmap.org/nominatim.git" } ) diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index 05f6a0539..b277f6991 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -25,6 +25,7 @@ default_attributes( } }, :nominatim => { + :enabled => false, :database => { :cluster => "9.3/main", :dbname => "nominatim", -- 2.43.2