X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/326a072ad0025a729806c9c9ab1d98effc65886a..1d23c59f10b2636d9c20b3da441aa22373f88af4:/cookbooks/web/recipes/backend.rb?ds=sidebyside

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 7dc229eeb..38515b07a 100644
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -26,16 +26,12 @@ 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_module "proxy"
+apache_module "proxy_fcgi"
+apache_module "setenvif"
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "www.openstreetmap.org" do
@@ -43,4 +39,4 @@ apache_site "www.openstreetmap.org" do
   variables :secret_key_base => web_passwords["secret_key_base"]
 end
 
-node.set[:memcached][:ip_address] = node.internal_ipaddress
+node.normal[:memcached][:ip_address] = node.internal_ipaddress