Switch culebre, fafnir, ladon and trogdor to squid 4

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index b7e4fc80ace9b9a97d1a012888b318df77ea796e..c50f0058849b88d1c2f9db6c40fbb7ab2ca26444 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -2,6 +2,9 @@ name "culebre"
 description "Master role applied to culebre"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -22,8 +25,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 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 => "zaragoza.render.openstreetmap.org",