X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/afffbd17113f7106338a3ec5bbee7eccd6df4211..97b22cb709e69073a375b323ed7760b8a2d4f891:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 7d41da54f..dd6b249b4 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -169,6 +169,9 @@ package %w[ pyosmium python3-psycopg2 python3-dotenv + python3-psutil + python3-jinja2 + python3-icu php-pgsql php-intl php-symfony-dotenv @@ -245,7 +248,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" @@ -267,8 +270,8 @@ end external_data = [ "wikimedia-importance.sql.gz", - "gb_postcode_data.sql.gz", - "us_postcode_data.sql.gz" + "gb_postcodes.csv.gz", + "us_postcodes.csv.gz" ] external_data.each do |fname| @@ -402,7 +405,8 @@ 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 @@ -466,6 +470,6 @@ 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