X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6ca293f3364cfa26435780dfa6081e13a92b1da0..60fb340c348c186bb9977877e8c2993623baa36a:/roles/culebre.rb

diff --git a/roles/culebre.rb b/roles/culebre.rb
index 56f6afc4e..c50f00588 100644
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -2,6 +2,9 @@ name "culebre"
 description "Master role applied to culebre"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -22,9 +25,14 @@ default_attributes(
     }
   },
   :squid => {
-    :version => "3",
-    :cache_mem => "6100 MB",
-    :cache_dir => "rock /store/squid/rock-01 80000 swap-timeout=500 max-swap-rate=150 slot-size=4096 max-size=262144"
+    :version => 4,
+    :cache_mem => "16384 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 => {
     :tile_parent => "zaragoza.render.openstreetmap.org",
@@ -32,7 +40,6 @@ default_attributes(
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }