X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/891d86d799c1c03889a9c6762c09560620cd15b3..5e3c457a4ef516a284363a709ad50724ef0df82f:/roles/saphira.rb?ds=inline

diff --git a/roles/saphira.rb b/roles/saphira.rb
index 4e32f12ee..ebfbc3126 100644
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -2,8 +2,10 @@ name "saphira"
 description "Master role applied to saphira"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "9g"
+  },
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -24,12 +26,19 @@ 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 => "6144 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 => "london.render.openstreetmap.org",
     :tile_siblings => [
+      "toothless.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",