From 4f6e8225fdfcd054fdb09f61b8be1e3e2684197c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Jun 2014 19:18:00 +0100
Subject: [PATCH] Use mod_proxy_fcgi on 14.04

---
 cookbooks/nominatim/recipes/default.rb           |  8 +++++++-
 cookbooks/nominatim/templates/default/apache.erb | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 64e484b39..ba010b0d6 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -29,7 +29,13 @@ package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
-apache_module "fastcgi-handler"
+
+if node[:lsb][:release].to_f >= 14.04
+  apache_module "proxy"
+  apache_module "proxy_fcgi"
+else
+  apache_module "fastcgi-handler"
+end
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index 120bccece..8e12362d1 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -27,17 +27,29 @@
         AddType text/html   .php
         AddType application/xml   .phpx
         AddType application/json   .phpj
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
+        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
+        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-www.sock|fcgi://localhost<%= @directory %>/website/
+<% else -%>
         AddHandler fcgi:/var/run/php5-fpm-www.sock .php
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpx
         AddHandler fcgi:/var/run/php5-fpm-www.sock .phpj
+<% end -%>
     </Directory>
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
     <Location /pool-<%= name %>>
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+        ProxyPassMatch ^/(.*\.php(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
+        ProxyPassMatch ^/(.*\.phpx(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
+        ProxyPassMatch ^/(.*\.phpj(/.*)?)$ unix:/var/run/php5-fpm-<%= name %>.sock|fcgi://localhost<%= @directory %>/website/
+<% else -%>
         AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .php
         AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpx
         AddHandler fcgi:/var/run/php5-fpm-<%= name %>.sock .phpj
+<% end -%>
     </Location>
     <% end -%>
 
-- 
2.43.2