Revert "Move readonly load to katla"

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 60b63eb2fc74892ec67b3dc53acabef53742e544..6f62f31865baa04d93e7ca5828375e5cfd83b911 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -28,13 +28,12 @@ apache_module "expires"
 apache_module "headers"
 apache_module "proxy_http"
 apache_module "proxy_balancer"
-if node[:lsb][:release].to_f >= 14.04
-  apache_module "lbmethod_bybusyness"
-end
+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
@@ -42,25 +41,9 @@ 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"
   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_"
-end