Enable planet-notes-dump

[chef.git] / cookbooks / nominatim / templates / default / apache.erb

diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index eeda42062f5d9de36db8b1803f9a74ab4a685ce7..5cdd947bcc3e359704146d60e58ec4e335437168 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -33,38 +33,38 @@
 <% end -%>
     </Directory>
 
-    <Location />
+    <LocationMatch /((?!pool-.*).*\.php[xj]?(/.*)?)$>
 <% 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 ]%>/
+        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
 <% 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
+        SetHandler fcgi:/var/run/php5-fpm-www.sock
 <% end -%>
-    </Location>
+    </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 ]%><%= @directory %>/website/$1
 <% 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 -%>
 
+<% 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