X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/13ef9975b5d6b159207273e971cf614477c793ca..95a336589b649ef6a10ecdcd346b399b611162a5:/roles/web-frontend.rb?ds=sidebyside diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 8e8fa817d..396cf36db 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -5,9 +5,10 @@ default_attributes( :apache => { :mpm => "event", :evasive => { - :page_count => 30, + :page_count => 100, :site_count => 100, - :blocking_period => 30 + :blocking_period => 30, + :enable => false }, :event => { :server_limit => 20, @@ -18,14 +19,6 @@ default_attributes( :async_request_worker_factor => 4 } }, - :logstash => { - :forwarder => { - "filebeat.inputs" => [ - { "type" => "filestream", "id" => "apache", "paths" => ["/var/log/apache2/access.log"], "fields" => { "type" => "apache" }, "fields_under_root" => true }, - { "type" => "filestream", "id" => "rails", "paths" => ["/var/log/web/rails-logstash.log"], "fields" => { "type" => "rails" }, "fields_under_root" => true } - ] - } - }, :memcached => { :memory_limit => 8192 }, @@ -57,6 +50,5 @@ default_attributes( run_list( "role[web]", - "role[logstash-forwarder]", "recipe[web::frontend]" )