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 f0a365c09666f42129e9ca7fd9f31ec0a8348f90..3b4fc7df108237b12945c2fff7925572a96273da 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -102,7 +102,7 @@ directory "#{basedir}/tablespaces" do
   mode "700"
 end
 
   mode "700"
 end
 

-# Note: tablespaces must be exactly in the same location on each
+# NOTE: tablespaces must be exactly in the same location on each

 #       Nominatim instance when replication is in use. Therefore
 #       use symlinks to canonical directory locations.
 node[:nominatim][:tablespaces].each do |name, location|
 #       Nominatim instance when replication is in use. Therefore
 #       use symlinks to canonical directory locations.
 node[:nominatim][:tablespaces].each do |name, location|


@@ -168,12 +168,17 @@ package %w[
   python3-pyosmium
   pyosmium
   python3-psycopg2
   python3-pyosmium
   pyosmium
   python3-psycopg2

+  python3-dotenv
+  python3-psutil
+  python3-jinja2

   php-pgsql
   php-intl
   php-pgsql
   php-intl

+  php-symfony-dotenv

 ]
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 ]
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"

+ui_directory = "#{basedir}/ui"

 
 directory build_directory do
   owner "nominatim"
 
 directory build_directory do
   owner "nominatim"


@@ -195,7 +200,15 @@ 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
+  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
 end
 
 execute "compile_nominatim" do


@@ -215,8 +228,8 @@ template "#{source_directory}/.git/hooks/post-merge" do
             :dbname => node[:nominatim][:dbname]
 end
 
             :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"
   owner "nominatim"
   group "nominatim"
   mode "664"


@@ -226,6 +239,21 @@ template "#{build_directory}/settings/local.php" do
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 

+git ui_directory do
+  action :sync
+  repository node[:nominatim][:ui_repository]
+  revision node[:nominatim][:ui_revision]
+  user "nominatim"
+  group "nominatim"
+end
+
+template "#{ui_directory}/dist/theme/config.theme.js" do
+  source "ui-config.js.erb"
+  owner "nominatim"
+  group "nominatim"
+  mode "664"
+end
+

 if node[:nominatim][:flatnode_file]
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
 if node[:nominatim][:flatnode_file]
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true


@@ -241,11 +269,12 @@ end
 
 external_data = [
   "wikimedia-importance.sql.gz",
 
 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|
 ]
 
 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"
     action :create_if_missing
     source "https://www.nominatim.org/data/#{fname}"
     owner "nominatim"


@@ -254,14 +283,6 @@ external_data.each do |fname|
   end
 end
 
   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
 if node[:nominatim][:state] == "off"
   cron_d "nominatim-backup" do
     action :delete


@@ -354,7 +375,7 @@ directory "#{basedir}/etc" do
   mode "775"
 end
 
   mode "775"
 end
 

-%w[user_agent referrer email].each do |name|
+%w[user_agent referrer email generic].each do |name|

   file "#{basedir}/etc/nginx_blocked_#{name}.conf" do
     action :create_if_missing
     owner "nominatim"
   file "#{basedir}/etc/nginx_blocked_#{name}.conf" do
     action :create_if_missing
     owner "nominatim"


@@ -365,8 +386,14 @@ end
 
 node[:nominatim][:fpm_pools].each do |name, data|
   php_fpm name do
 
 node[:nominatim][:fpm_pools].each do |name, data|
   php_fpm name do

-    template "fpm.conf.erb"
-    variables data.merge(:name => name)
+    port data[:port]
+    pm data[:pm]
+    pm_max_children data[:max_children]
+    pm_start_servers 20
+    pm_min_spare_servers 10
+    pm_max_spare_servers 20
+    pm_max_requests 10000
+    prometheus_port data[:prometheus_port]

   end
 end
 
   end
 end
 


@@ -377,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
 


@@ -391,12 +419,15 @@ nginx_site "default" do
   action [:delete]
 end
 
   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],
 nginx_site "nominatim" do
   template "nginx.erb"
   directory build_directory
   variables :pools => node[:nominatim][:fpm_pools],

-            :frontends => search(:node, "recipes:web\\:\\:frontend"),
-            :confdir => "#{basedir}/etc"
+            :frontends => frontends,
+            :confdir => "#{basedir}/etc",
+            :ui_directory => ui_directory

 end
 
 template "/etc/logrotate.d/nginx" do
 end
 
 template "/etc/logrotate.d/nginx" do


@@ -432,9 +463,12 @@ end
 
 include_recipe "fail2ban"
 
 
 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]
 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
 end