Switch jakelong to squid 4

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 557d762da186bf723e7ad26abbdb1b16b73db81c..1016e27a8e78e61a3cb7c0a7ca6849279961e500 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -2,38 +2,52 @@ name "konqi"
 description "Master role applied to konqi"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "18g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.104"
-      },
-      :external_ipv4_alias => {
-        :interface => "eth0:1",
-        :family => :inet,
-        :address => "193.63.75.105",
-       :prefix => "27"
+        :address => "81.7.11.83",
+        :prefix => "24",
+        :gateway => "81.7.11.1"
       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:215:60ff:feaa:9956"
+        :address => "2a02:180:1:1::517:b53",
+        :prefix => "64",
+        :gateway => "2a02:180:1:1::1"
       }
     }
-  }
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
-    :search => [ "ic.openstreetmap.org", "openstreetmap.org" ],
+  },
+  :squid => {
+    :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 => [
+      "katie.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[wiki]"
+  "role[euserv]",
+  "role[tilecache]"
 )