X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6a1f3b40b51cfad8ef65a8c3a45815a854b6a6bc..9b4b2aab7e2feeb21beeff9bce1e466d9c38dba5:/cookbooks/nominatim/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 75f06fa56..d6ea07376 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -132,6 +132,7 @@ package %w[ libpq-dev libproj-dev liblua5.3-dev + libluajit-5.1-dev lua5.3 python3-pyosmium python3-psycopg2 @@ -197,7 +198,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" @@ -207,7 +208,7 @@ execute "compile_nominatim" do action :nothing user "nominatim" cwd build_directory - command "cmake #{source_directory} && make" + command "cmake -D WITH_LUAJIT=ON #{source_directory} && make" notifies :run, "execute[install_nominatim]" end @@ -232,10 +233,18 @@ template "#{project_directory}/.env" do :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" @@ -512,6 +521,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]}"