X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f2992559d31ea10792ba3a92fe558fbd8d7795ef..7eb3680b81fdf339e466d9279584805f17a54c0f:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index dd6b249b4..7e32db7e6 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -180,6 +180,8 @@ package %w[ source_directory = "#{basedir}/nominatim" build_directory = "#{basedir}/bin" ui_directory = "#{basedir}/ui" +qa_bin_directory = "#{basedir}/Nominatim-Data-Analyser" +qa_data_directory = "#{basedir}/qa-data" directory build_directory do owner "nominatim" @@ -237,7 +239,8 @@ template "#{build_directory}/.env" do variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org", :dbname => node[:nominatim][:dbname], :flatnode_file => node[:nominatim][:flatnode_file], - :log_file => "#{node[:nominatim][:logdir]}/query.log" + :log_file => "#{node[:nominatim][:logdir]}/query.log", + :tokenizer => node[:nominatim][:config][:tokenizer] end git ui_directory do @@ -347,7 +350,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 @@ -473,3 +478,44 @@ fail2ban_jail "nominatim_limit_req" do maxretry 20 ignoreips frontend_addresses.flatten.sort end + +### QA tile generation + +if node[:nominatim][:enable_qa_tiles] + git qa_bin_directory do + repository node[:nominatim][:qa_repository] + revision node[:nominatim][:qa_revision] + enable_submodules true + user "nominatim" + group "nominatim" + notifies :run, "execute[compile_qa]" + end + + execute "compile_qa" do + action :nothing + user "nominatim" + cwd "#{qa_bin_directory}/clustering-vt" + command "make" + end + + directory qa_data_directory do + owner "nominatim" + group "nominatim" + mode "755" + recursive true + end + + template "#{qa_bin_directory}/analyser/config/config.yaml" do + source "qa_config.erb" + owner "nominatim" + group "nominatim" + mode "755" + variables :outputdir => "#{qa_data_directory}/new" + end + + link "#{build_directory}/website/qa-data" do + to "#{qa_data_directory}/current" + owner "nominatim" + group "nominatim" + end +end