X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/33243121ffc92f08550c263963a13707bcf8aed8..5dbe4824675963fb0fe374b18b326445aa9fdc0f:/roles/katie.rb

diff --git a/roles/katie.rb b/roles/katie.rb
index bf69a2c19..b54ebb13f 100644
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -13,6 +13,10 @@ default_attributes(
       }
     }
   },
+  :hardware => {
+    :shm_size => "20g"
+  },
+  :location => "Falkenstein, Germany",
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -34,19 +38,17 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 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 => "germany.render.openstreetmap.org",
-    :tile_siblings => [
-      "konqi.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "germany.render.openstreetmap.org"
   }
 )