nominatim: move apache setup to the end of the script

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index b15e1f90470cfbf3e545e0a5291fb20a3818961f..88b9cf6fa49e3c85749c12575570525703c1d5f8 100644 (file)
--- 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 '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
 end