X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/90d2b917a2150651c41ad501500a820ee4a6aa81..4dc38e3fedffd4b79c22a6962183fd5fd88a088d:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 75c357902..3e547c1ea 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
@@ -380,7 +383,7 @@ end
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
-  php_fpm name.to_s do
+  php_fpm name do
     port data[:port]
     pm data[:pm]
     pm_max_children data[:max_children]
@@ -388,6 +391,7 @@ node[:nominatim][:fpm_pools].each do |name, data|
     pm_min_spare_servers 10
     pm_max_spare_servers 20
     pm_max_requests 10000
+    prometheus_port data[:prometheus_port]
   end
 end
 
@@ -412,11 +416,13 @@ nginx_site "default" do
   action [:delete]
 end
 
+frontends = search(:node, "recipes:web\\:\\:frontend").sort_by(&:name)
+
 nginx_site "nominatim" do
   template "nginx.erb"
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools],
-            :frontends => search(:node, "recipes:web\\:\\:frontend"),
+            :frontends => frontends,
             :confdir => "#{basedir}/etc",
             :ui_directory => ui_directory
 end
@@ -454,9 +460,12 @@ end
 
 include_recipe "fail2ban"
 
+frontend_addresses = frontends.collect { |f| f.ipaddresses(:role => :external) }
+
 fail2ban_jail "nominatim_limit_req" do
   filter "nginx-limit-req"
   logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
   ports [80, 443]
   maxretry 5
+  ignoreips frontend_addresses.flatten.sort
 end