From cefa230b9f63d0aa01d44e362288966c51d67da5 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 7 Oct 2014 22:13:21 +0200
Subject: [PATCH] get rid of multiviews and locationmatch to make apache 2,4
 happy

---
 cookbooks/nominatim/recipes/default.rb        | 14 ++++----------
 .../nominatim/templates/default/apache.erb    | 19 ++++++++-----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3f490b272..af96a9c77 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -61,6 +61,10 @@ apache_site "nominatim.openstreetmap.org" do
   variables :pools => node[:nominatim][:fpm_pools]
 end
 
+apache_site "default" do
+  action [ :disable ]
+end
+
 node[:nominatim][:fpm_pools].each do |name,data|
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
@@ -230,16 +234,6 @@ cron "nominatim_vacuum" do
   mailto email_errors
 end
 
-['search', 'reverse'].each do |filename|
-  ['phpj', 'phpx'].each do |ext|
-    link "#{source_directory}/website/#{filename}.#{ext}" do
-      to "#{source_directory}/website/#{filename}.php"
-      user "nominatim"
-      group "nominatim"
-    end
-  end
-end
-
 template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user   "nominatim"
diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 5cdd947bc..4c16dcf4f 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -24,32 +24,29 @@
     DocumentRoot <%= @directory %>/website
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
-        Options MultiViews FollowSymLinks
-        AddType text/html   .php
-        AddType application/xml   .phpx
-        AddType application/json   .phpj
+        Options FollowSymLinks
 <% if node[:lsb][:release].to_f >= 14.04 -%>
         Require all granted
 <% end -%>
     </Directory>
 
-    <LocationMatch /((?!pool-.*).*\.php[xj]?(/.*)?)$>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
+    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
-<% end -%>
     </LocationMatch>
+<% end -%>
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-    <LocationMatch /pool-<%= name %>/(.*\.php[xj]?(/.*)?)$>
 <% if node[:lsb][:release].to_f >= 14.04 -%>
-        ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
+    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
-<% end -%>
     </LocationMatch>
+<% end -%>
     <% end -%>
 
 <% if node[:lsb][:release].to_f >= 14.04 -%>
@@ -78,7 +75,7 @@
 
     # 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>
 
-- 
2.43.2