Merge remote-tracking branch 'github/pull/202'

[chef.git] / roles / culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 99039aeb2aab220390688d8e0858001eb3e0adb1..954adeb78e4488e7d6e0b67a3462c7d6611c8af0 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -22,9 +22,8 @@ default_attributes(
     }
   },
   :squid => {
-    :version => "3",
     :cache_mem => "6100 MB",
-    :cache_dir => "rock /store/squid/rock-01 80000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :tile_parent => "zaragoza.render.openstreetmap.org",