X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/979e98164cc9a6d7216197f01febc918c9a152b9..de36e6558743eebc1185d32fa0b58dbafe9bbc53:/roles/saphira.rb

diff --git a/roles/saphira.rb b/roles/saphira.rb
index fb67c55de..1d9ae6a73 100644
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -2,6 +2,9 @@ name "saphira"
 description "Master role applied to saphira"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "10g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,16 +26,30 @@ 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 => "8192 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "4096M"
+      }
+    }
   },
   :tilecache => {
     :tile_parent => "london.render.openstreetmap.org",
     :tile_siblings => [
+      "toothless.openstreetmap.org",
       "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }
@@ -40,5 +57,6 @@ default_attributes(
 
 run_list(
   "role[jump]",
+  "role[geodns]",
   "role[tilecache]"
 )