X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2cbbd3f2b8bed8cf096170137045d9721452745d..4905aae927c0671d2b8e5b5c9665122fb39b0877:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index d8c9666ce..8a3cf027e 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -3,23 +3,24 @@
 # 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 >> <%= node[:nominatim][:logdir] %>/update.log 2>&1
+    exec >> <%= @logfile %> 2>&1
     starttime=`date +%s`
 
     ./utils/update.php --no-npi --import-osmosis
 
+    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
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`