X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/14e316cd3e1ab5f25a54d0765ebad61ac665ccb4..aabd38390f8a58c3966b9e3acb942cf45ceeb33b:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 7b218d951..26e4d4caf 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -131,6 +131,8 @@ package %w[ libbz2-dev libpq-dev libproj-dev + liblua5.3-dev + lua5.3 python3-pyosmium python3-psycopg2 python3-dotenv @@ -195,7 +197,7 @@ 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" + source "https://nominatim.org/data/country_grid.sql.gz" owner "nominatim" group "nominatim" mode "644" @@ -226,13 +228,22 @@ template "#{project_directory}/.env" do :dbname => node[:nominatim][:dbname], :flatnode_file => node[:nominatim][:flatnode_file], :log_file => "#{node[:nominatim][:logdir]}/query.log", - :tokenizer => node[:nominatim][:config][:tokenizer] + :tokenizer => node[:nominatim][:config][:tokenizer], + :forward_dependencies => node[:nominatim][:config][:forward_dependencies] end -%w[wikimedia-importance.sql.gz gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname| +remote_file "#{project_directory}/wikimedia-importance.sql.gz" do + action :create_if_missing + source "https://nominatim.org/data/wikimedia-importance.sql.gz" + owner "nominatim" + group "nominatim" + mode "644" +end + +%w[gb_postcodes.csv.gz us_postcodes.csv.gz].each do |fname| remote_file "#{project_directory}/#{fname}" do action :create - source "https://www.nominatim.org/data/#{fname}" + source "https://nominatim.org/data/#{fname}" owner "nominatim" group "nominatim" mode "644" @@ -509,6 +520,7 @@ end prometheus_exporter "nominatim" do port 8082 user "www-data" + restrict_address_families "AF_UNIX" options [ "--nominatim.query-log=#{node[:nominatim][:logdir]}/query.log", "--nominatim.database-name=#{node[:nominatim][:dbname]}"