From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 13 Apr 2017 20:18:10 +0000 (+0200)
Subject: nominatim: disable automatic code updates on dulcy
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/8c0c354ccdecd8772cb32087d2c666dcbc053fc1

nominatim: disable automatic code updates on dulcy
---

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index ab273d84a..2805a8606 100644
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -6,6 +6,7 @@ default[:nominatim][:logdir] = "/var/log/nominatim"
 default[:nominatim][:repository] = "git://git.openstreetmap.org/nominatim.git"
 default[:nominatim][:revision] = "master"
 default[:nominatim][:enable_backup] = false
+default[:nominatim][:enable_git_updates] = true
 
 default[:nominatim][:fpm_pools] = {
   :www => {
diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 8a3cf027e..bf9a00101 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -13,6 +13,7 @@ do
 
     ./utils/update.php --no-npi --import-osmosis
 
+<% if node[:nominatim][:enable_git_updates] -%>
     pushd <%= @srcdir %>
     if git fetch origin; then
       # will trigger recompilation if necessary
@@ -21,6 +22,7 @@ do
       echo "WARNING: git fetch failed."
     fi
     popd
+<% end -%>
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`
diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index a1e930e78..8e48b997d 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -41,6 +41,7 @@ default_attributes(
   :nominatim => {
     :state => "standalone",
     :enable_backup => false,
+    :enable_git_updates => false,
     :dbadmins => %w(lonvia tomh),
     :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",