Merge what remains of apache::ssl into apache::default

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

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index ae359ca472d86d51ccc6df056cad1d180f6bdeab..afc852c00772dee772952437715ec2712c3a1ea9 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
@@ -39,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