X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6b191f27ba13c5627fca7e56cf1c7e99a2c70572..901782e5452c232c7e6f644f2c56a3903b09edf3:/roles/stormfly-02.rb

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 71e6b5d7c..c09c268fb 100644
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -2,6 +2,9 @@ name "stormfly-02"
 description "Master role applied to stormfly-02"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "38g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -19,12 +22,27 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "21000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "32768 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"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "65536M"
+      }
+    }
   },
   :tilecache => {
-    :tile_parent => "usa.render.openstreetmap.org",
-    :tile_siblings => []
+    :tile_parent => "corvallis.render.openstreetmap.org",
+    :tile_siblings => [
+      "stormfly-01.openstreetmap.org"
+    ]
   }
 )