Update carto stylesheet to v2.32.0

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

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index 69b5db1aec294612c399263c313d793021664627..390de61f93ed3653b6a7b1441156a182e4642aa8 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apache::ssl"
 include_recipe "postgresql"
 
 include_recipe "apache::ssl"
 include_recipe "postgresql"

-include_recipe "git"

 
 package "php5"
 package "php5-cli"
 
 package "php5"
 package "php5-cli"


@@ -49,16 +48,6 @@ service "php5-fpm" do
   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

-apache_site "nominatim.openstreetmap.org" do
-  template "apache.erb"
-  directory source_directory
-  variables :pools => node[:nominatim][:fpm_pools]
-end
-
-apache_site "default" do
-  action [:disable]
-end
-

 node[:nominatim][:fpm_pools].each do |name, data|
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
 node[:nominatim][:fpm_pools].each do |name, data|
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"


@@ -257,8 +246,18 @@ directory "/data/postgresql-archive" do
   only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
 end
 
   only_if { node[:postgresql][:settings][:defaults][:archive_mode] == "on" }
 end
 

+apache_site "nominatim.openstreetmap.org" do
+  template "apache.erb"
+  directory source_directory
+  variables :pools => node[:nominatim][:fpm_pools]
+end
+
+apache_site "default" do
+  action [:disable]
+end
+

 fail2ban_filter "nominatim" do
 fail2ban_filter "nominatim" do

-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" (403|429) '
+  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '

 end
 
 fail2ban_jail "nominatim" do
 end
 
 fail2ban_jail "nominatim" do