Switch kalessin, katie, keizer and konqi to squid 4

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 5f7fb006ff832ecb0c978c58bd7b6f4d6a15a0fc..1016e27a8e78e61a3cb7c0a7ca6849279961e500 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -2,10 +2,13 @@ name "konqi"
 description "Master role applied to konqi"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "p2p1",
+        :interface => "eth0",
         :role => :external,
         :family => :inet,
         :address => "81.7.11.83",
@@ -13,30 +16,33 @@ default_attributes(
         :gateway => "81.7.11.1"
       },
       :external_ipv6 => {
-        :interface => "p2p1",
+        :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2a02:180:1:1::517:ad5",
+        :address => "2a02:180:1:1::517:b53",
         :prefix => "64",
         :gateway => "2a02:180:1:1::1"
       }
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 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 => "germany.render.openstreetmap.org",
     :tile_siblings => [
-       "tabaluga.openstreetmap.org",
-       "katie.openstreetmap.org",
-       "trogdor.openstreetmap.org",
-       "nepomuk.openstreetmap.org",
-       "ridgeback.openstreetmap.org",
-       "fume.openstreetmap.org",
-       "gorynych.openstreetmap.org",
-       "simurgh.openstreetmap.org"
+      "katie.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
     ]
   }
 )