Use mod_proxy_fcgi for FCGI support with apache 2.4

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index b059d4f4435a7e126c28ec3987933c08594ef3c9..7dc229eeb12220d6ca588d145514e7badd61962a 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -24,10 +24,16 @@ include_recipe "web::cgimap"
 
 web_passwords = data_bag_item("web", "passwords")
 
 
 web_passwords = data_bag_item("web", "passwords")
 

-apache_module "fastcgi-handler"

 apache_module "remoteip"
 apache_module "rewrite"
 
 apache_module "remoteip"
 apache_module "rewrite"
 

+if node[:lsb][:release].to_f >= 14.04
+  apache_module "proxy"
+  apache_module "proxy_fcgi"
+else
+  apache_module "fastcgi-handler"
+end
+

 apache_site "default" do
   action [ :disable ]
 end
 apache_site "default" do
   action [ :disable ]
 end

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index 7f3c3977b497a504eb8eb6f055c696b571f660f4..336ab56c5ccd5878d9c71d8dcf4d8b754164c2a9 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -49,8 +49,14 @@
   #
   RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
   #
   RewriteRule ^/api/0\.6/map$ - [H=fcgi:127.0.0.1:8000]
   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$

+<% if node[:lsb][:release].to_f >= 14.04 -%>
+  RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ fcgi://127.0.0.1:8000$0 [P]
+  RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:8000$0 [P]
+<% else -%>

   RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(nodes|ways|relations)$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ - [H=fcgi:127.0.0.1:8000]
   RewriteRule ^/api/0\.6/(nodes|ways|relations)$ - [H=fcgi:127.0.0.1:8000]

+<% end -%>

 </VirtualHost>
 <% end -%>
 </VirtualHost>
 <% end -%>