Rework api_calls_num using API statistics and enable it again

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index b6146eb8cc01cd831ab4972ed6806a6416a583de..0a1a7328496f7648795187df6b1b603a4e5adfda 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -28,10 +28,12 @@ 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_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "www.openstreetmap.org" do
@@ -39,10 +41,6 @@ apache_site "www.openstreetmap.org" do
   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"
@@ -50,9 +48,7 @@ template "/etc/logrotate.d/apache2" do
   mode 0644
 end
 
-munin_plugin "api_calls_num" do
-  action :delete
-end
+munin_plugin "api_calls_num"
 
 munin_plugin "api_calls_#{node[:hostname]}" do
   target "api_calls_"