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

[chef.git] / roles / chrysophylax.rb

diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb
index db509a876b2d0ded1ed37c4a2e60bd4a6624c530..ce4b9be22493c9c178ce39a51946ceba8a26632a 100644 (file)
--- a/roles/chrysophylax.rb
+++ b/roles/chrysophylax.rb
@@ -3,7 +3,7 @@ description "Master role applied to chrysophylax"
 
 default_attributes(
   :hardware => {
-    :shm_size => "12g"
+    :shm_size => "14g"
   },
   :networking => {
     :interfaces => {
@@ -35,13 +35,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 => "16384M"
+      }
+    }
+  },
   :tilecache => {
-    :tile_parent => "zurich.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org"
-    ]
+    :tile_parent => "zurich.render.openstreetmap.org"
   }
 )