X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bbd5408eea96c6d3176090779dfe195c5ab195e6..787431aa384f07d403f422ca64447e8bdf794e3f:/roles/necrosan.rb

diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index ea0650556..66fdf569b 100644
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -2,6 +2,9 @@ name "necrosan"
 description "Master role applied to necrosan"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,8 +26,14 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "12288 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 => "france.render.openstreetmap.org",