Disable nominatim cron jobs on pummelzacken for now

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 0a0640fd8332cb34c7b615be73ef20ab840e7193..bca915d9145497894271112d5259834b95384135 100644 (file)
--- 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 e26882dc66130330885eedb49a4c04d00afb3e91..1c620147253cf76d6b1cf02464cc42388d6f450f 100644 (file)
--- 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 05f6a053929c3ed3c6b89f52aa5e9e16e80914ca..b277f6991d4fb4c67b9c56ee12d87f56138741b1 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -25,6 +25,7 @@ default_attributes(
     }
   },
   :nominatim => {
+    :enabled => false,
     :database => {
         :cluster => "9.3/main",
         :dbname => "nominatim",