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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3f490b2727741a1c2e8c8bef77459f31c6d6dfaa..af96a9c771977cc6df90a8c4c7fe0ca342d621e5 100644 (file)
--- 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
 
   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"
 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
 
   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"
 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 5cdd947bcc3e359704146d60e58ec4e335437168..4c16dcf4f22c26ede9c566add006dcd5988ac071 100644 (file)
--- 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
     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>
 
 <% 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 -%>
 <% 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 -%>
 <% else -%>

+    <LocationMatch /((?!pool-.*).*\.php(/.*)?)$>

         SetHandler fcgi:/var/run/php5-fpm-www.sock
         SetHandler fcgi:/var/run/php5-fpm-www.sock

-<% end -%>

     </LocationMatch>
     </LocationMatch>

+<% end -%>

 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"

-    <LocationMatch /pool-<%= name %>/(.*\.php[xj]?(/.*)?)$>

 <% if node[:lsb][:release].to_f >= 14.04 -%>
 <% 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 -%>
 <% else -%>

+    <LocationMatch /pool-<%= name %>/(.*\.php(/.*)?)$>

         SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
         SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock

-<% end -%>

     </LocationMatch>
     </LocationMatch>

+<% end -%>

     <% end -%>
 
 <% if node[:lsb][:release].to_f >= 14.04 -%>
     <% 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
 
     # 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>