nominatim: disable automatic code updates on dulcy

[chef.git] / cookbooks / nominatim / templates / default / updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index d839e6bb49aae685349dee18c40cc0b2d71c9d1c..bf9a001013884305f39fe46fd9bbec6f6c809c16 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,23 +3,26 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Change to Nominatim directory
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-cd $DIR/..
+cd <%= @bindir %>
 
 while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
-    exec >> <%= @logfile %>/update.log 2>&1
+    exec >> <%= @logfile %> 2>&1
     starttime=`date +%s`
 
     ./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
       git merge origin/<%= @branch %>
     else
       echo "WARNING: git fetch failed."
     fi
+    popd
+<% end -%>
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`