X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3acb5c42fb0b3963eafa4e542d11b2a48b99cefc..43c7a17290b6ff3913eec96b5f6b096c9c48acc1:/cookbooks/web/recipes/frontend.rb diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb index e1adc5d56..636cb56d7 100644 --- a/cookbooks/web/recipes/frontend.rb +++ b/cookbooks/web/recipes/frontend.rb @@ -23,7 +23,6 @@ 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" @@ -31,9 +30,10 @@ 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 @@ -41,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_" + mode 0o644 end