nominatim: use correct branch in update script

[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 beea8c8ac5e896cd99a25dfc0b9d086e3bb21c48..d839e6bb49aae685349dee18c40cc0b2d71c9d1c 100644 (file)
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -6,17 +6,17 @@
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd $DIR/..
 
-while true
+while [ ! -f "<%= @update_stop_file %>" ]
 do
     # Send output to the log (logrotatable)
-    exec >> /var/log/nominatim/update.log 2>&1
+    exec >> <%= @logfile %>/update.log 2>&1
     starttime=`date +%s`
 
     ./utils/update.php --no-npi --import-osmosis
 
     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