Switch kalessin, katie, keizer and konqi to squid 4

[chef.git] / roles / keizer.rb

diff --git a/roles/keizer.rb b/roles/keizer.rb
index 4bf691bdc56bde65167dbaf99f09495dde6513f9..5c3ddea26e7afa095f806a07baf4de6bb2946955 100644 (file)
--- a/roles/keizer.rb
+++ b/roles/keizer.rb
@@ -2,6 +2,9 @@ name "keizer"
 description "Master role applied to keizer"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :location => "Nuremberg, Germany",
   :networking => {
     :interfaces => {
@@ -24,14 +27,19 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "12288 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "germany.render.openstreetmap.org",
     :tile_siblings => [
       "katie.openstreetmap.org",
-      "kalessin.openstreetmap.org",
       "konqi.openstreetmap.org"
     ]
   }