From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Jun 2014 11:57:03 +0000 (+0100)
Subject: ProxyPassMatch can't be in a <Directory> section
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ecc865a502c5c8d1b6dd1ed3814c190da0d127b4?hp=592e808593b1b5651b7130cab8122a2ab0b7df7e;ds=sidebyside

ProxyPassMatch can't be in a <Directory> section
---

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 9f3dcd34b..1c8c82f7d 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -28,6 +28,9 @@
         AddType text/html   .php
         AddType application/xml   .phpx
         AddType application/json   .phpj
+    </Directory>
+
+    <Location />
 <% if node[:lsb][:release].to_f >= 14.04 -%>
         ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
         ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
@@ -37,7 +40,7 @@
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
 <% end -%>
-    </Directory>
+    </Location>
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"