X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8aa57233f9034b901d7a652bd6276d0d7c3ea4f0..8c0c354ccdecd8772cb32087d2c666dcbc053fc1:/cookbooks/nominatim/templates/default/updater.erb?ds=sidebyside

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index aba7f72aa..bf9a00101 100644
--- 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 >> /var/log/nominatim/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/master
+      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`