Switch necrosan, nepomuk, noomoahk and norbert to squid 4

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 697baa17c3448b12929762f4b3621699cb04a898..c4c5119a684be34d10e2a611519d363d85962699 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -2,8 +2,10 @@ name "trogdor"
 description "Master role applied to trogdor"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -27,15 +29,20 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "6400 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "10240 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"
+    ]
   },
   :tilecache => {
     :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"