X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6dc624ab40b613b092d8339d77bb669491bd9281..fbdd990ff399d26a11e0dce096e15ef2d8cde521:/cookbooks/nominatim/recipes/base.rb

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index c754d10d5..390de61f9 100644
--- 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 "git"
 
 package "php5"
 package "php5-cli"
@@ -31,6 +30,7 @@ package "php-apc"
 apache_module "rewrite"
 apache_module "proxy"
 apache_module "proxy_fcgi"
+apache_module "proxy_http"
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
@@ -48,16 +48,6 @@ service "php5-fpm" do
   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"
@@ -121,7 +111,6 @@ execute "compile_nominatim" do
   user "nominatim"
 end
 
-
 directory "#{source_directory}/log" do
   owner "nominatim"
   group "nominatim"
@@ -257,8 +246,18 @@ directory "/data/postgresql-archive" do
   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
-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" (403|429) '
+  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
 end
 
 fail2ban_jail "nominatim" do