Bump cookstyle from 7.14.2 to 7.15.0

[chef.git] / roles / chrysophylax.rb

diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb
index f3574f77927f6207d3aa5d21a924d121debe999e..ce4b9be22493c9c178ce39a51946ceba8a26632a 100644 (file)
--- a/roles/chrysophylax.rb
+++ b/roles/chrysophylax.rb
@@ -27,7 +27,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
-    :cache_mem => "12288 MB",
+    :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",
@@ -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"
   }
 )