Update piwik to 3.1.0

[chef.git] / cookbooks / web / recipes / backend.rb

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 7dc229eeb12220d6ca588d145514e7badd61962a..afc852c00772dee772952437715ec2712c3a1ea9 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
 #
 
 include_recipe "memcached"

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 


@@ -26,16 +26,12 @@ web_passwords = data_bag_item("web", "passwords")
 
 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_module "proxy"
+apache_module "proxy_fcgi"
+apache_module "setenvif"

 
 apache_site "default" do
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "www.openstreetmap.org" do
 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
 
   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