Update ridgeback configuration for squid 3

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index e8d1a4ff4c1fdf1fdad07898fb09f1e344f9ad57..90ae277e165f6240899bacda82b37c082b0ea1d8 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -46,13 +46,13 @@ default_attributes(
     }
   },
   :squid => {
+    :version => "3",
     :cache_mem => "5500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :cache_dir => "rock /store/squid/rock-01 128000 slot-size=4096 max-size=262144"
   },
   :tilecache => {
     :tile_parent => "oslo.render.openstreetmap.org",
     :tile_siblings => [
-      "fume.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
@@ -65,5 +65,6 @@ default_attributes(
 
 run_list(
   "role[blix-no]",
+  "role[geodns]",
   "role[tilecache]"
 )