mediawiki: enable noreply config

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index fd7f495734f6d5ba9960f2baa6d994e7b9adb791..78717add8df28e243b1ea4b43a3981e221f28769 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,8 +168,10 @@ package %w[
   python3-pyosmium
   pyosmium
   python3-psycopg2
   python3-pyosmium
   pyosmium
   python3-psycopg2

+  python3-dotenv

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

+  php-symfony-dotenv

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


@@ -216,8 +218,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"


@@ -380,7 +382,7 @@ end
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
 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]
     port data[:port]
     pm data[:pm]
     pm_max_children data[:max_children]


@@ -388,6 +390,7 @@ node[:nominatim][:fpm_pools].each do |name, data|
     pm_min_spare_servers 10
     pm_max_spare_servers 20
     pm_max_requests 10000
     pm_min_spare_servers 10
     pm_max_spare_servers 20
     pm_max_requests 10000

+    prometheus_port data[:prometheus_port]

   end
 end
 
   end
 end
 


@@ -412,11 +415,13 @@ 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"),
+            :frontends => frontends,

             :confdir => "#{basedir}/etc",
             :ui_directory => ui_directory
 end
             :confdir => "#{basedir}/etc",
             :ui_directory => ui_directory
 end


@@ -454,9 +459,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]
   maxretry 5
 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
 end