Switch kalessin, katie, keizer and konqi to squid 4

diff --git a/roles/kalessin.rb b/roles/kalessin.rb
index 8805233edf46ccef02bb6592443f90bcb25c2a33..b1e728219bfcc00cffc8de7aa11c5e4abe81bafd 100644 (file)
--- a/roles/kalessin.rb
+++ b/roles/kalessin.rb
@@ -2,6 +2,9 @@ name "kalessin"
 description "Master role applied to kalessin"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :nginx => {
     :cache => {

diff --git a/roles/katie.rb b/roles/katie.rb
index f387555a9712c0bb28df3dc52348721666f488bd..82044753d34f974bfe9615cb48de835a52289335 100644 (file)
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -13,6 +13,9 @@ default_attributes(
       }
     }
   },
+  :hardware => {
+    :shm_size => "18g"
+  },
   :location => "Falkenstein, Germany",
   :networking => {
     :interfaces => {
@@ -35,8 +38,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "germany.render.openstreetmap.org",

diff --git a/roles/keizer.rb b/roles/keizer.rb
index 9bb3e2eb0f5c3ddfd93cd45e0b07850cb33afc01..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,8 +27,14 @@ 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",

diff --git a/roles/konqi.rb b/roles/konqi.rb
index fda937fdbc8047920a97f8164b42c703aa390efe..1016e27a8e78e61a3cb7c0a7ca6849279961e500 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -2,6 +2,9 @@ name "konqi"
 description "Master role applied to konqi"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "germany.render.openstreetmap.org",