X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/38df5ffe2eaed2d8f8d57193ad5e408763d66e5e..0970d9770176c7dd94e6e8ad56925c66439537b9:/cookbooks/nominatim/templates/default/apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 9f3dcd34b..3eae1357a 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -29,35 +29,33 @@
         AddType application/xml   .phpx
         AddType application/json   .phpj
 <% 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 ]%>/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
-<% else -%>
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
+        Require all granted
 <% end -%>
     </Directory>
 
+    <LocationMatch /.*\.php[xj]?(/.*)?$>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
+<% else -%>
+        SetHandler fcgi:/var/run/php5-fpm-www.sock
+<% end -%>
+    </LocationMatch>
+
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <Location /pool-<%= name %>>
+    <LocationMatch /pool-<%= name %>/.*\.php[xj]?(/.*)?$>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
-        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
-        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:<%= details[:port ]%>/
+        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%>/
 <% else -%>
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpj
+        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
 <% end -%>
-    </Location>
+    </LocationMatch>
     <% end -%>
 
-    Redirect 420 /pool-block/
-    ErrorDocument 420 /509.html
+    Redirect 429 /pool-block/
+    ErrorDocument 429 /509.html
     <Location /pool-block>
-        ErrorDocument 420 /509.html
+        ErrorDocument 429 /509.html
     </Location>
     Redirect 403 /pool-ban/
     <Location /pool-ban>