X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/989d520730ec4c8c3def7f91993d9c8c4b47293f..a4e98a39669d82fc53a3d7f3fcc65689c05cc6cd:/roles/konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 65105bafb..6d51f0938 100644
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -5,34 +5,42 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "p4p1",
         :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",
+        :interface => "p4p1",
         :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 => {
+    :cache_mem => "12500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "germany.render.openstreetmap.org",
+    :tile_siblings => [
+      "katie.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "fume.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ic]"
+  "role[euserv]",
+  "role[tilecache]"
 )