Update squid 3 configurations

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index a680230427df53284366c62e51ef0e38fc6f3d86..5074bafdd4172834f3eac395f65360dd8007a4bc 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -9,6 +9,16 @@ default_attributes(
         :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
+        }
       }
     }
   },
@@ -36,13 +46,13 @@ default_attributes(
     }
   },
   :squid => {
+    :version => "3",
     :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=300 max-swap-rate=50 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",
     :tile_siblings => [
-      "fume.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
@@ -50,24 +60,11 @@ default_attributes(
       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]
-  },
-  :munin => {
-    :plugins => {
-      :smart_sda => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      },
-      :smart_sdb => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      }
-    }
   }
 )
 
 run_list(
   "role[blix-no]",
+  "role[geodns]",
   "role[tilecache]"
 )