Explicitly set number of osm2pgsql processes

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 017f9de7977762129c619fcc91c510b72c446bad..6e3ee6834f9bbc36c9549ab8484e94ff3e351511 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -8,32 +8,38 @@ default_attributes(
         :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 => {
+    :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",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[wiki-old]"
+  "role[euserv]",
+  "role[tilecache]"
 )