get rid of multiviews and locationmatch to make apache 2,4 happy

[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 de4fb525eefe0cf5ff51a81f4767f8ab3bfa7d9c..4c16dcf4f22c26ede9c566add006dcd5988ac071 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -1,13 +1,22 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-<VirtualHost *:80>
-    ServerName nominatim.openstreetmap.org
-    ServerAdmin webmaster@openstreetmap.org
+<% [80, 443].each do |port| -%>
+<VirtualHost *:<%= port %>>
+    ServerName <%= node[:fqdn] %>
+    ServerAlias nominatim.openstreetmap.org

     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org
     ServerAlias nominatim.osm.org
     ServerAlias nominatim.openstreetmap.org
     ServerAlias nominatim.openstreetmap.net
     ServerAlias nominatim.openstreetmaps.org
     ServerAlias nominatim.openmaps.org

+    ServerAdmin webmaster@openstreetmap.org
+
+<% if port == 443 -%>
+    #
+    # Enable SSL
+    #
+    SSLEngine on
+<% end -%>

 
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log
 
     CustomLog /var/log/apache2/nominatim.openstreetmap.org-access.log combined
     ErrorLog /var/log/apache2/nominatim.openstreetmap.org-error.log


@@ -15,32 +24,44 @@
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php

-        Options MultiViews FollowSymLinks
-        AddType text/html   .php
-        AddType application/xml   .phpx
-        AddType application/json   .phpj
-        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
+        Options FollowSymLinks
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        Require all granted
+<% end -%>

     </Directory>
 
     </Directory>
 

-    Alias /pool-www/ "<%= @directory %>/website/"
-    <Location /pool-www>
-        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
-    </Location>
-    Alias /pool-bulk/ "<%= @directory %>/website/"
-    <Location /pool-bulk>
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .php
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpx
-        AddHandler fcgi:/var/run/php5-fpm-bulk.sock .phpj
+<% 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 -%>
+
+    <% @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 -%>
+    <% 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>
     </Location>

-    Redirect 509 /pool-block/
-    ErrorDocument 509 /509.html
+<% else -%>
+    Redirect 420 /pool-block/
+    ErrorDocument 420 /509.html

     <Location /pool-block>
     <Location /pool-block>

-        ErrorDocument 509 /509.html
+        ErrorDocument 420 /509.html

     </Location>
     </Location>

+<% end -%>

     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html


@@ -54,6 +75,8 @@
 
     # regular requests and autoblocks
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map
 
     # regular requests and autoblocks
     RewriteMap bulklist txt:<%= @directory %>/settings/ip_blocks.map

-    RewriteRule ^/([sdr].*) /pool-${bulklist:%{REMOTE_ADDR}|www}/$1 [PT]
+    RewriteRule ^/(search|reverse|details)(\.php)?(/.*)? /pool-${bulklist:%{REMOTE_ADDR}|www}/$1.php$3 [PT]

 
 </VirtualHost>
 
 </VirtualHost>

+
+<% end -%>