X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cc7dc2d10bf3457a9d6a28931bf96539bfac6491..10c13d4a2f1550d1b8e85d4284f60d9be974bef0:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index b5496a652..bb08987c7 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -168,8 +168,10 @@ package %w[
   python3-pyosmium
   pyosmium
   python3-psycopg2
+  python3-dotenv
   php-pgsql
   php-intl
+  php-symfony-dotenv
 ]
 
 source_directory = "#{basedir}/nominatim"
@@ -196,7 +198,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,8 +226,8 @@ 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"
@@ -235,7 +245,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 +267,12 @@ end
 
 external_data = [
   "wikimedia-importance.sql.gz",
-  "gb_postcode_data.sql.gz"
+  "gb_postcode_data.sql.gz",
+  "us_postcode_data.sql.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 +281,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
@@ -399,7 +402,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
 
@@ -463,6 +467,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