Don't include the networking recipe

[chef.git] / roles / saphira.rb

diff --git a/roles/saphira.rb b/roles/saphira.rb
index b56d76cfffd92cff220f3c16e54256ff13c0dcb6..dcb011087ad3b0a4d92c79c75ce610453572ec94 100644 (file)
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -23,21 +23,23 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :cache_mem => "6100 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :tile_parent => "london.render.openstreetmap.org",
     :tile_siblings => [
       "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
       "gorynych.openstreetmap.org"
     ]
   }
 )
 
 run_list(
-  "role[jump]"
+  "role[jump]",
+  "role[geodns]",
+  "role[tilecache]"
 )