Revert "Update jakelong configuration for squid 3"

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 48c2fc2ce02d46defc4fa4f6b88297f0c1a24899..f4fd327d1d1a3a406d34ffbeffc0ddfa21db4b31 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -14,12 +14,32 @@ default_attributes(
       }
     }
   },
       }
     }
   },

+  :sysfs => {
+    :md_tune => {
+      :comment => "Tune the md sync performance so as not to kill system performance",
+      :parameters => {
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000",
+        "block/md1/md/sync_speed_min" => "1",
+        "block/md1/md/sync_speed_max" => "100000"
+      }
+    }
+  },

   :squid => {
   :squid => {

+    :version => "3",

     :cache_mem => "6400 MB",
     :cache_mem => "6400 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 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"

   },
   :tilecache => {
   },
   :tilecache => {

-    :tile_parent => "orm.openstreetmap.org"
+    :tile_parent => "amsterdam.render.openstreetmap.org",
+    :tile_siblings => [
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]

   }
 )
 
   }
 )