Reduce cache memory limit on chrysophylax and sarkany

[chef.git] / roles / chrysophylax.rb

diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb
index a96ab9e205f2c14def7c2af11230d200b2223662..db509a876b2d0ded1ed37c4a2e60bd4a6624c530 100644 (file)
--- a/roles/chrysophylax.rb
+++ b/roles/chrysophylax.rb
@@ -2,6 +2,9 @@ name "chrysophylax"
 description "Master role applied to chrysophylax"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,14 +26,19 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :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"
+    ]
   },
   :tilecache => {
     :tile_parent => "zurich.render.openstreetmap.org",
     :tile_siblings => [
       "noomoahk.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
       "ladon.openstreetmap.org",
       "culebre.openstreetmap.org"
     ]