From 9e2b2da0b74aa41c278d4df6aa042978c705fff0 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 13 Jul 2015 20:08:16 +0200 Subject: [PATCH] nominatim: move apache setup to the end of the script --- cookbooks/nominatim/recipes/base.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb index b15e1f904..88b9cf6fa 100644 --- a/cookbooks/nominatim/recipes/base.rb +++ b/cookbooks/nominatim/recipes/base.rb @@ -49,16 +49,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" @@ -257,6 +247,16 @@ 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 '^ - - \[[^]]+\] "[^"]+" 429 ' end -- 2.43.2