X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fa9d2a88e9f89d755f1a637b88d189e8900e38ef..d6e747c1df695fcf00aea07b34caabe74b6fbb67:/cookbooks/nominatim/templates/default/updater.erb diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index d839e6bb4..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 >> <%= @logfile %>/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/<%= @branch %> else echo "WARNING: git fetch failed." fi + popd # sleep a bit if updates take less than a minute endtime=`date +%s`