nominatim: disable automatic code updates on dulcy

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index ab273d84a556acc13f1d74d0cf1ca952705f50e2..2805a8606d59c4c707d4ffda980a12d59c378a3e 100644 (file)
--- 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][: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 => {
 
 default[:nominatim][:fpm_pools] = {
   :www => {

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index 8a3cf027edf4f2549a835e300d8e5d566afc8c49..bf9a001013884305f39fe46fd9bbec6f6c809c16 100644 (file)
--- 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
 
 
     ./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
     pushd <%= @srcdir %>
     if git fetch origin; then
       # will trigger recompilation if necessary


@@ -21,6 +22,7 @@ do
       echo "WARNING: git fetch failed."
     fi
     popd
       echo "WARNING: git fetch failed."
     fi
     popd

+<% end -%>

 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index a1e930e788472d89eb62c6c7b64d036a3c777673..8e48b997ddb89c3548ff595ae8189c05d95c0591 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -41,6 +41,7 @@ default_attributes(
   :nominatim => {
     :state => "standalone",
     :enable_backup => false,
   :nominatim => {
     :state => "standalone",
     :enable_backup => false,

+    :enable_git_updates => false,

     :dbadmins => %w(lonvia tomh),
     :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :dbadmins => %w(lonvia tomh),
     :dbcluster => "9.5/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",