X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7874880284b6fd9a66dd6297c15d2ed37163a686..f1d53774f16d3ac9956520d407a1a8488df201fe:/cookbooks/nominatim/templates/default/updater.erb

diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb
index c0a0ad49b..beea8c8ac 100644
--- a/cookbooks/nominatim/templates/default/updater.erb
+++ b/cookbooks/nominatim/templates/default/updater.erb
@@ -2,21 +2,24 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-# Send output to the log
-exec >> /var/log/nominatim/update.log 2>&1
-
 # Change to Nominatim directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd $DIR/..
 
 while true
 do
+    # Send output to the log (logrotatable)
+    exec >> /var/log/nominatim/update.log 2>&1
     starttime=`date +%s`
 
     ./utils/update.php --no-npi --import-osmosis
 
-    # will trigger recompilation if necessary
-    git pull
+    if git fetch origin; then
+      # will trigger recompilation if necessary
+      git merge origin/master
+    else
+      echo "WARNING: git fetch failed."
+    fi
 
     # sleep a bit if updates take less than a minute
     endtime=`date +%s`