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

diff --git a/roles/ladon.rb b/roles/ladon.rb
index 6a46263a0..5534b0836 100644
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -2,6 +2,9 @@ name "ladon"
 description "Master role applied to ladon"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "36g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -15,7 +18,7 @@ default_attributes(
           :mode => "802.3ad",
           :miimon => "100",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w(eth0 eth1)
+          :slaves => %w[eth0 eth1]
         }
       },
       :external_ipv6 => {
@@ -29,10 +32,16 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "32768 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 => {
+  :tilecache => {
     :tile_parent => "athens.render.openstreetmap.org",
     :tile_siblings => [
       "trogdor.openstreetmap.org",