tilecache: Use squid standby connections

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 362bc513a5136b3781c9addf89244b0f2d2918ac..4c0b7b0b9196934cf8f7900199965bd26c2bbb14 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -2,6 +2,9 @@ name "nepomuk"
 description "Master role applied to nepomuk"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "14g"
+  },
   :networking => {
     :firewall => {
       :inet => [
@@ -46,8 +49,14 @@ 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 => "12288 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"
+    ]
   },
   :sysfs => {
     :hdd_tune => {
@@ -60,12 +69,11 @@ default_attributes(
   :tilecache => {
     :tile_parent => "france.render.openstreetmap.org",
     :tile_siblings => [
+      # "necrosan.openstreetmap.org", # IO Overloaded
+      # "nepomuk.openstreetmap.org",
       "noomoahk.openstreetmap.org",
       "norbert.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
+      "ladon.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }