Switch necrosan, nepomuk, noomoahk and norbert to squid 4

[chef.git] / roles / noomoahk.rb

diff --git a/roles/noomoahk.rb b/roles/noomoahk.rb
index ebeea8409784e8f40f6f50d7f7e5416c0d3454a7..ff30559cad4a80b144b510f98085248ea1e0a632 100644 (file)
--- a/roles/noomoahk.rb
+++ b/roles/noomoahk.rb
@@ -2,6 +2,9 @@ name "noomoahk"
 description "Master role applied to noomoahk"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "6g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,16 +26,24 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "3100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "4096 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
   },
   :tilecache => {
     :tile_parent => "france.render.openstreetmap.org",
     :tile_siblings => [
+      # "necrosan.openstreetmap.org", # IO Overloaded
       "nepomuk.openstreetmap.org",
+      # "noomoahk.openstreetmap.org",
       "norbert.openstreetmap.org",
       "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org"
+      "gorynych.openstreetmap.org"
     ]
   }
 )