X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/75de7f924c8f67b5feae7d2666e81da94a695928..fa741e4951ecf0d56e78f2b10c8e41503a42e881:/roles/trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index f4fd327d1..7e0c601cf 100644
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -2,6 +2,9 @@ name "trogdor"
 description "Master role applied to trogdor"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -26,20 +29,24 @@ default_attributes(
     }
   },
   :squid => {
-    :version => "3",
-    :cache_mem => "6400 MB",
-    :cache_dir => "rock /store/squid/rock-01 128000 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
+    :version => 4,
+    :cache_mem => "10240 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 => "131072M"
+      }
+    }
   },
   :tilecache => {
-    :tile_parent => "amsterdam.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "netherlands.render.openstreetmap.org"
   }
 )