X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2cd6a527ccf654edd83ce73cbd897f900e3537ef..765613710ab9bab6ac6ce5b69e2faee27e9948dc:/roles/cherufe.rb

diff --git a/roles/cherufe.rb b/roles/cherufe.rb
index df7fb7bc0..2fa0d68e3 100644
--- a/roles/cherufe.rb
+++ b/roles/cherufe.rb
@@ -2,6 +2,9 @@ name "cherufe"
 description "Master role applied to cherufe"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "10g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -18,8 +21,14 @@ default_attributes(
     :port => 45222
   },
   :squid => {
-    :cache_mem => "6000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "8192 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 => "vinadelmar.render.openstreetmap.org",