Merge remote-tracking branch 'github/pull/219'

diff --git a/cookbooks/stats/templates/default/awstats.cron.erb b/cookbooks/stats/templates/default/awstats.cron.erb
index 5d081e61994ff64ca8767ba64ccfc7b9c4fbd803..e5bafaffffa659c516efe8d28d4714a2828bed2c 100644 (file)
--- a/cookbooks/stats/templates/default/awstats.cron.erb
+++ b/cookbooks/stats/templates/default/awstats.cron.erb
@@ -1,5 +1,5 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <% @sites.each_with_index do |site,index| -%>
-0 <%= "%02d" % [ 8 + index * 2 ] %> * * <%= site[:days] %> www-data /usr/lib/cgi-bin/awstats.pl -config=<%= site[:name] %> -update > /dev/null
+0 <%= "%02d" % [ 8 + index * 2 ] %> * * <%= site[:days] %> www-data /usr/bin/nice -n 20 /usr/lib/cgi-bin/awstats.pl -config=<%= site[:name] %> -update > /dev/null
 <% end -%>

diff --git a/roles/base.rb b/roles/base.rb
index 3fab5ba8b5ea0fbebbf44f3e6d516204db7cbb53..d680fddb110e442b3043d208d6b83e0cb21cebb1 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -51,7 +51,10 @@ default_attributes(
     },
     :network_backlog => {
       :comment => "Increase maximum backlog for incoming network packets",
-      :parameters => { "net.core.netdev_max_backlog" => "2500" }
+      :parameters => {
+        "net.core.netdev_max_backlog" => "2500",
+        "net.core.netdev_budget" => "600"
+      }
     },
     :network_conntrack_established => {
       :comment => "Only track established connections for four hours",