X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/11d0975caf6d12fb54162b81a554e1b6c1e6317a..b7579691793f64a2cc7fd86930ed33ffcde88b98:/cookbooks/web/recipes/backend.rb

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 6898b42be..7dc229eeb 100644
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -22,16 +22,25 @@ include_recipe "apache::ssl"
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
-apache_module "fastcgi-handler"
+web_passwords = data_bag_item("web", "passwords")
+
 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 "www.openstreetmap.org" do
   template "apache.backend.erb"
+  variables :secret_key_base => web_passwords["secret_key_base"]
 end
 
 node.set[:memcached][:ip_address] = node.internal_ipaddress