X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/69aad675cd589bf027f1cee3062e9a22807403eb..2ede7f6e467c5f4263602063621355d922e55acd:/roles/jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 4eff9e02a..cd8bcb17b 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,6 +2,9 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "3g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,12 +26,19 @@ default_attributes(
     }
   },
   :squid => {
+    :version => 4,
     :cache_mem => "1024 MB",
-    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"
+    :cache_dir => [
+      "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :nginx => {
     :cache => {
       :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
         :max_size => "2048M"
       }
     }
@@ -49,13 +59,7 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "ascalon.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]
+    :tile_parent => "sanfrancisco.render.openstreetmap.org"
   }
 )