Use cgimap from PPA rather than building from source.

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

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index ed80fd21d3852325114067ec6385723ff00f3594..38515b07aed8ff36f58896254878fd7338e6299e 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -18,19 +18,25 @@
 #
 
 include_recipe "memcached"
 #
 
 include_recipe "memcached"

+include_recipe "apache::ssl"

 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
 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"
 apache_module "remoteip"
 apache_module "rewrite"

+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
   template "apache.backend.erb"
 end
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"

+  variables :secret_key_base => web_passwords["secret_key_base"]

 end
 
 end
 

-node.set[:memcached][:ip_address] = node.internal_ipaddress
+node.normal[:memcached][:ip_address] = node.internal_ipaddress