create archive directory on nominatim master

[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 4c16dcf4f22c26ede9c566add006dcd5988ac071..230063643a46ebb815906796550cc1225ca27f6b 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -25,43 +25,21 @@
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
         Options FollowSymLinks
-<% if node[:lsb][:release].to_f >= 14.04 -%>
         Require all granted
-<% end -%>
     </Directory>
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-    ProxyPassMatch /((?!pool-.*).*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch /((?!pool-.*).*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-www.sock
-    </LocationMatch>
-<% end -%>
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-    ProxyPassMatch /pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch /pool-<%= name %>/(.*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
-    </LocationMatch>
-<% end -%>
+    ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
     <% 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