Merge branch 'planetdump-ng'

[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..be0e48a59011c94d10ae1dbb26e448af0c82679d 100644 (file)
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -31,9 +31,9 @@
     </Directory>
 
 <% if node[:lsb][:release].to_f >= 14.04 -%>
     </Directory>
 
 <% if node[:lsb][:release].to_f >= 14.04 -%>

-    ProxyPassMatch /((?!pool-.*).*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
+    ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1

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

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

         SetHandler fcgi:/var/run/php5-fpm-www.sock
     </LocationMatch>
 <% end -%>
         SetHandler fcgi:/var/run/php5-fpm-www.sock
     </LocationMatch>
 <% end -%>


@@ -41,9 +41,9 @@
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
 <% if node[:lsb][:release].to_f >= 14.04 -%>
     <% @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
+    ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1

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

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

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