From 0fc444d10eef30ff318e8269d6bd5553f837d8de Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 10 Jun 2014 22:53:14 +0100 Subject: [PATCH] Fix up passing of paths to FCGI on apache 2.4 --- cookbooks/nominatim/templates/default/apache.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb index 8203cf1e5..5cdd947bc 100644 --- a/cookbooks/nominatim/templates/default/apache.erb +++ b/cookbooks/nominatim/templates/default/apache.erb @@ -33,9 +33,9 @@ <% end -%> - + <% if node[:lsb][:release].to_f >= 14.04 -%> - ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%>/ + ProxyPassMatch fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1 <% else -%> SetHandler fcgi:/var/run/php5-fpm-www.sock <% end -%> @@ -43,9 +43,9 @@ <% @pools.each do |name,details| -%> Alias /pool-<%= name %>/ "<%= @directory %>/website/" - /.*\.php[xj]?(/.*)?$> + /(.*\.php[xj]?(/.*)?)$> <% if node[:lsb][:release].to_f >= 14.04 -%> - ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%>/ + ProxyPassMatch fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1 <% else -%> SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock <% end -%> -- 2.39.5