Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index fbbe30af40c515e8ddc35c3fc2633b835fba2bc3..3b4fc7df108237b12945c2fff7925572a96273da 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -169,6 +169,8 @@ package %w[
   pyosmium
   python3-psycopg2
   python3-dotenv
   pyosmium
   python3-psycopg2
   python3-dotenv

+  python3-psutil
+  python3-jinja2

   php-pgsql
   php-intl
   php-symfony-dotenv
   php-pgsql
   php-intl
   php-symfony-dotenv


@@ -198,7 +200,7 @@ git source_directory do
   user "nominatim"
   group "nominatim"
   not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
   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
 end
 
 remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do


@@ -245,7 +247,7 @@ git ui_directory do
   group "nominatim"
 end
 
   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"
   source "ui-config.js.erb"
   owner "nominatim"
   group "nominatim"


@@ -402,7 +404,8 @@ ssl_certificate node[:fqdn] do
            "nominatim.openstreetmap.com",
            "nominatim.openstreetmap.net",
            "nominatim.openstreetmaps.org",
            "nominatim.openstreetmap.com",
            "nominatim.openstreetmap.net",
            "nominatim.openstreetmaps.org",

-           "nominatim.openmaps.org"]
+           "nominatim.openmaps.org",
+           "nominatim.qgis.org"]

   notifies :reload, "service[nginx]"
 end
 
   notifies :reload, "service[nginx]"
 end
 


@@ -466,6 +469,6 @@ fail2ban_jail "nominatim_limit_req" do
   filter "nginx-limit-req"
   logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
   ports [80, 443]
   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
   ignoreips frontend_addresses.flatten.sort
 end