From: Sarah Hoffmann Date: Tue, 31 Aug 2021 12:35:33 +0000 (+0200) Subject: nominatim: add nightly updates for QA tiles X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/026e50458591504810f05d5d0f2fa1d432cdd86a?hp=-c nominatim: add nightly updates for QA tiles --- 026e50458591504810f05d5d0f2fa1d432cdd86a diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index f13b21e1f..b7d7a803e 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -349,7 +349,9 @@ template "#{source_directory}/utils/nominatim-update" do :logfile => "#{node[:nominatim][:logdir]}/update.log", :branch => node[:nominatim][:revision], :update_stop_file => "#{basedir}/status/updates_disabled", - :update_maintenance_trigger => "#{basedir}/status/update_maintenance" + :update_maintenance_trigger => "#{basedir}/status/update_maintenance", + :qabindir => qa_bin_directory, + :qadatadir => qa_data_directory end template "/etc/init.d/nominatim-update" do diff --git a/cookbooks/nominatim/templates/default/updater.erb b/cookbooks/nominatim/templates/default/updater.erb index cfa5de79b..d3fd0d937 100644 --- a/cookbooks/nominatim/templates/default/updater.erb +++ b/cookbooks/nominatim/templates/default/updater.erb @@ -38,5 +38,16 @@ do if [ -f "<%= @update_maintenance_trigger %>" ]; then rm <%= @update_maintenance_trigger %> ./nominatim refresh --postcodes --threads 4 -v +<% if node[:nominatim][:enable_qa_tiles] -%> + pushd <%= @qabindir %> + if python3 cli.py --execute-all; then + rm -rf "<%= @qadatadir %>/old" + if [ -d "<%= @qadatadir %>/current" ]; then + mv "<%= @qadatadir %>/current" "<%= @qadatadir %>/old" + fi + mv "<%= @qadatadir %>/new" "<%= @qadatadir %>/current" + fi + popd +<% end -%> fi done