Enable munin monitoring for Grifon machines

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 8e6da21eeb45674c4c5ffdedafd18ed9fde333aa..c7f4ac75a95d7f09d5aa8a6caa24782d1149c9b4 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,12 +12,8 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
-  :munin => {
-    :plugins => {
-      :cpu => {
-        :user => { :warning => 200, :critical => 400 }
-      }
-    }
+  :nginx => {
+    :access_log => false
   },
   :sysctl => {
     :network_conntrack_time_wait => {
@@ -29,7 +25,7 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-        "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "262142"
       }
     },
     :kernel_tfo_listen_enable => {