Switch nidhogg, ridgeback and rimfaxe to squid 4

[chef.git] / roles / rimfaxe.rb

diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb
index 8d58ea2014e72e1c49489bf240fa20bfee9a2073..bf06a94bc941484163bcd765097ca10ec1f74118 100644 (file)
--- a/roles/rimfaxe.rb
+++ b/roles/rimfaxe.rb
@@ -2,6 +2,9 @@ name "rimfaxe"
 description "Master role applied to rimfaxe"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -11,17 +14,30 @@ default_attributes(
         :address => "130.225.254.109",
         :prefix => "27",
         :gateway => "130.225.254.97"
+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:878:346::109",
+        :prefix => "64",
+        :gateway => "2001:878:346::97"
       }
     }
   },
   :squid => {
-    :cache_mem => "7000 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 => "aalborg.render.openstreetmap.org",
     :tile_siblings => [
-      "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",