X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c3f9cf702ba600099b52905299f9551301c39b60..7fdccdf940e933f4d918cd827ff8f26bfe75fe11:/cookbooks/nominatim/templates/default/updater.erb diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index acadc9a02..beea8c8ac 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -2,22 +2,23 @@ # 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 - if ! git pull; then - echo "WARNING: git update failed." + 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