Switch fume to use squid 3 with a hierarchical cache

diff --git a/roles/fume.rb b/roles/fume.rb
index a023e8a04fb0c6d7958442cdfb0b7dcc8c94fd88..4af18a3bf7111ac2481fd32d9532c026c081f04f 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -15,8 +15,14 @@ default_attributes(
     }
   },
   :squid => {
+    :version => 3,
     :cache_mem => "4096 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :cache_dir => [
+      "rock /store/squid/rock-4096 50000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 15000 swap-timeout=300 max-swap-rate=50 slot-size=8192 max-size=8092",
+      "rock /store/squid/rock-16384 25000 swap-timeout=300 max-swap-rate=50 slot-size=16384 max-size=16284",
+      "rock /store/squid/rock-32768 35000 swap-timeout=300 max-swap-rate=50 slot-size=32768 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "pilsen.render.openstreetmap.org",