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

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 3eae1357a..5cdd947bc 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -33,9 +33,9 @@
 <% end -%>
     </Directory>
 
-    <LocationMatch /.*\.php[xj]?(/.*)?$>
+    <LocationMatch /((?!pool-.*).*\.php[xj]?(/.*)?)$>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/
+        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
 <% else -%>
         SetHandler fcgi:/var/run/php5-fpm-www.sock
 <% end -%>
@@ -43,20 +43,28 @@
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <LocationMatch /pool-<%= name %>/.*\.php[xj]?(/.*)?$>
+    <LocationMatch /pool-<%= name %>/(.*\.php[xj]?(/.*)?)$>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%>/
+        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
 <% else -%>
         SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
 <% end -%>
     </LocationMatch>
     <% end -%>
 
+<% if node[:lsb][:release].to_f >= 14.04 -%>
     Redirect 429 /pool-block/
     ErrorDocument 429 /509.html
     <Location /pool-block>
         ErrorDocument 429 /509.html
     </Location>
+<% else -%>
+    Redirect 420 /pool-block/
+    ErrorDocument 420 /509.html
+    <Location /pool-block>
+        ErrorDocument 420 /509.html
+    </Location>
+<% end -%>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html