squid: remove broken logrotate file + no cache digest

[chef.git] / cookbooks / apache / attributes / default.rb

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 469a1a90d9fe9269fcc78f1fb6f29d3248c9f26c..cff5e5b839c1b5fb0af59eed4b16e1d32b2feb73 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -7,27 +7,27 @@ default[:apache][:keepalive] = true
 default[:apache][:prefork][:start_servers] = 5
 default[:apache][:prefork][:min_spare_servers] = 5
 default[:apache][:prefork][:max_spare_servers] = 10
 default[:apache][:prefork][:start_servers] = 5
 default[:apache][:prefork][:min_spare_servers] = 5
 default[:apache][:prefork][:max_spare_servers] = 10

-default[:apache][:prefork][:max_clients] = 150
-default[:apache][:prefork][:max_requests_per_child] = 0
+default[:apache][:prefork][:max_request_workers] = 150
+default[:apache][:prefork][:max_connections_per_child] = 0

 
 default[:apache][:worker][:start_servers] = 2
 default[:apache][:worker][:min_spare_threads] = 25
 default[:apache][:worker][:max_spare_threads] = 75
 default[:apache][:worker][:thread_limit] = 64
 default[:apache][:worker][:threads_per_child] = 25
 
 default[:apache][:worker][:start_servers] = 2
 default[:apache][:worker][:min_spare_threads] = 25
 default[:apache][:worker][:max_spare_threads] = 75
 default[:apache][:worker][:thread_limit] = 64
 default[:apache][:worker][:threads_per_child] = 25

-default[:apache][:worker][:max_clients] = 150
-default[:apache][:worker][:max_requests_per_child] = 0
+default[:apache][:worker][:max_request_workers] = 150
+default[:apache][:worker][:max_connections_per_child] = 0

 
 default[:apache][:event][:start_servers] = 2
 
 default[:apache][:event][:start_servers] = 2

-default[:apache][:event][:max_clients] = 150

 default[:apache][:event][:min_spare_threads] = 25
 default[:apache][:event][:max_spare_threads] = 75
 default[:apache][:event][:thread_limit] = 64
 default[:apache][:event][:threads_per_child] = 25
 default[:apache][:event][:min_spare_threads] = 25
 default[:apache][:event][:max_spare_threads] = 75
 default[:apache][:event][:thread_limit] = 64
 default[:apache][:event][:threads_per_child] = 25

-default[:apache][:event][:max_requests_per_child] = 0
+default[:apache][:event][:max_request_workers] = 150
+default[:apache][:event][:max_connections_per_child] = 0

 
 default[:apache][:listen_address] = "*"
 
 
 default[:apache][:listen_address] = "*"
 

-default[:apache][:ssl][:certificate] = "openstreetmap"
-

 default[:apache][:buffered_logs] = true
 default[:apache][:buffered_logs] = true

+
+default[:apache][:reqtimeout] = false