Merge remote-tracking branch 'github/pull/272'

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index c4c5119a684be34d10e2a611519d363d85962699..7e0c601cfb5412bbb9a04be1e1aa1cd701a67f73 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -3,7 +3,7 @@ description "Master role applied to trogdor"
 
 default_attributes(
   :hardware => {
-    :shm_size => "12g"
+    :shm_size => "14g"
   },
   :networking => {
     :interfaces => {
@@ -38,15 +38,15 @@ default_attributes(
       "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",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "netherlands.render.openstreetmap.org"
   }
 )