match complete URIs in nominatim's apache conf

[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 8203cf1e5a9c43a33a37e12ac0a6a926f9bbefbc..be0e48a59011c94d10ae1dbb26e448af0c82679d 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 /.*\.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 ]%>/
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1

 <% else -%>
 <% else -%>

+    <LocationMatch ^/([^/]*\.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 ]%>/
+    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>