Update jakelong configuration for squid 3

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index cc6deb36bfad92076d99dbdbe7302a43a9e24c4d..bf3a851335b66c7dcb8d91a5a83ef229b3914d6e 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,26 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
 description "Master role applied to ridgeback"
 
 default_attributes(

+  :munin => {
+    :plugins => {
+      :ipmi_fans => {
+        :Fan4 => { :graph => "no", :warning => "0:" },
+        :Fan5 => { :graph => "no", :warning => "0:" },
+        :Fan6 => { :graph => "no", :warning => "0:" },
+        :Fan7CPU1 => { :graph => "no", :warning => "0:" }
+      },
+      :smart_sda => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      },
+      :smart_sdb => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      }
+    }
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -18,20 +38,33 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {

-        "block/md0/md/sync_speed_min" => "10",
-        "block/md0/md/sync_speed_max" => "10000",
-        "block/md1/md/sync_speed_min" => "10",
-        "block/md1/md/sync_speed_max" => "10000"
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000",
+        "block/md1/md/sync_speed_min" => "1",
+        "block/md1/md/sync_speed_max" => "100000"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

+    :version => "3",

     :cache_mem => "5500 MB",
     :cache_mem => "5500 MB",

-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+  },
+  :tilecache => {
+    :tile_parent => "oslo.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]

   }
 )
 
 run_list(
   "role[blix-no]",
   }
 )
 
 run_list(
   "role[blix-no]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )