X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/211ad09a3962946435369bc15a471320e3b13e70..1e07aa23bfd2bcc46dd6a82855d9f316a17a39ca:/cookbooks/nominatim/templates/default/updater.erb?ds=sidebyside diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index 5c5a4448b..bf9a00101 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -13,12 +13,16 @@ do ./utils/update.php --no-npi --import-osmosis +<% if node[:nominatim][:enable_git_updates] -%> + pushd <%= @srcdir %> if git fetch origin; then # will trigger recompilation if necessary git merge origin/<%= @branch %> else echo "WARNING: git fetch failed." fi + popd +<% end -%> # sleep a bit if updates take less than a minute endtime=`date +%s`