Update combined tilecache graphs for delay pool changes

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 8ed2db77b0fb4eaadd7c8b0f51233aed1b4d420c..636cb56d726274642a2bf068d4ea0dcd2ee10a2a 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -20,41 +20,30 @@
 include_recipe "apache::ssl"
 include_recipe "web::rails"
 
+web_passwords = data_bag_item("web", "passwords")
+
 apache_module "alias"
-apache_module "deflate"
 apache_module "expires"
 apache_module "headers"
 apache_module "proxy_http"
 apache_module "proxy_balancer"
+apache_module "lbmethod_byrequests"
+apache_module "lbmethod_bybusyness"
 apache_module "rewrite"
+apache_module "unique_id"
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"
+  variables :secret_key_base => web_passwords["secret_key_base"]
 end
 
-gem_package "hpricot"
-gem_package "home_run"
-gem_package "apachelogregex"
-
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
-end
-
-munin_plugin "api_calls_num" do
-  action :delete
-end
-
-munin_plugin "api_calls_#{node[:hostname]}" do
-  target "api_calls_"
-end
-
-munin_plugin "api_waits_#{node[:hostname]}" do
-  target "api_waits_"
+  mode 0o644
 end