X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/388687b7120815bc61f49de6c5dd0ea793dad67b..0ed5b0633287123c7927db26632efedaa9df4467:/roles/stormfly-02.rb?ds=sidebyside

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 47307292d..25cce34ae 100644
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -2,15 +2,16 @@ name "stormfly-02"
 description "Master role applied to stormfly-02"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "38g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "em1",
         :role => :external,
         :family => :inet,
-        :address => "140.211.167.105",
-        :prefix => "28",
-        :gateway => "140.211.167.97"
+        :address => "140.211.167.105"
       },
       :external_ipv6 => {
         :interface => "em1",
@@ -21,17 +22,24 @@ 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 => "corvallis.render.openstreetmap.org",
-    :tile_siblings => [
-      "ascalon.openstreetmap.org",
-      "jakelong.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "lurien.openstreetmap.org"
-    ]
+    :tile_parent => "corvallis.render.openstreetmap.org"
   }
 )