X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2eeabe9b50dc30e53e2477f7cc55a45ea5912a7a..e9c0351232f0e45f94cdda0dd615c1fb82616a7f:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index b5496a652..47d113acc 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -52,17 +52,6 @@ file "#{node[:nominatim][:logdir]}/update.log" do mode "664" end -# exception granted for a limited time so that they can set up their own server -firewall_rule "increase-limits-gnome-proxy" do - action :accept - family "inet" - source "net:8.43.85.23" - dest "fw" - proto "tcp:syn" - dest_ports "https" - rate_limit "s:10/sec:30" -end - ## Postgresql include_recipe "postgresql" @@ -168,13 +157,20 @@ package %w[ python3-pyosmium pyosmium python3-psycopg2 + python3-dotenv + python3-psutil + python3-jinja2 + python3-icu php-pgsql php-intl + php-symfony-dotenv ] 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" @@ -196,7 +192,15 @@ git source_directory do user "nominatim" group "nominatim" not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") } - notifies :run, "execute[compile_nominatim]", :immediately + notifies :run, "execute[compile_nominatim]" +end + +remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do + action :create_if_missing + source "https://www.nominatim.org/data/country_grid.sql.gz" + owner "nominatim" + group "nominatim" + mode "644" end execute "compile_nominatim" do @@ -216,15 +220,16 @@ template "#{source_directory}/.git/hooks/post-merge" do :dbname => node[:nominatim][:dbname] end -template "#{build_directory}/settings/local.php" do - source "settings.erb" +template "#{build_directory}/.env" do + source "nominatim.env.erb" owner "nominatim" group "nominatim" mode "664" 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 @@ -235,7 +240,7 @@ git ui_directory do group "nominatim" end -template "#{ui_directory}/dist/config.js" do +template "#{ui_directory}/dist/theme/config.theme.js" do source "ui-config.js.erb" owner "nominatim" group "nominatim" @@ -257,11 +262,12 @@ end external_data = [ "wikimedia-importance.sql.gz", - "gb_postcode_data.sql.gz" + "gb_postcodes.csv.gz", + "us_postcodes.csv.gz" ] external_data.each do |fname| - remote_file "#{source_directory}/data/#{fname}" do + remote_file "#{build_directory}/#{fname}" do action :create_if_missing source "https://www.nominatim.org/data/#{fname}" owner "nominatim" @@ -270,14 +276,6 @@ external_data.each do |fname| end end -remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do - action :create_if_missing - source "https://www.nominatim.org/data/country_grid.sql.gz" - owner "nominatim" - group "nominatim" - mode "644" -end - if node[:nominatim][:state] == "off" cron_d "nominatim-backup" do action :delete @@ -341,7 +339,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 @@ -399,14 +399,11 @@ ssl_certificate node[:fqdn] do "nominatim.openstreetmap.com", "nominatim.openstreetmap.net", "nominatim.openstreetmaps.org", - "nominatim.openmaps.org"] + "nominatim.openmaps.org", + "nominatim.qgis.org"] notifies :reload, "service[nginx]" end -package "apache2" do - action :remove -end - include_recipe "nginx" nginx_site "default" do @@ -463,6 +460,47 @@ fail2ban_jail "nominatim_limit_req" do filter "nginx-limit-req" logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log" ports [80, 443] - maxretry 5 + 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