Update default SSL cipher list and remove tilecache override

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 4dd68f0255eff20166bba4af5ea05890f70388ed..6e3ee6834f9bbc36c9549ab8484e94ff3e351511 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "p2p1",
+        :interface => "eth0",
         :role => :external,
         :family => :inet,
         :address => "81.7.11.83",
@@ -13,7 +13,7 @@ default_attributes(
         :gateway => "81.7.11.1"
       },
       :external_ipv6 => {
-        :interface => "p2p1",
+        :interface => "eth0",
         :role => :external,
         :family => :inet6,
         :address => "2a02:180:1:1::517:b53",
@@ -29,12 +29,10 @@ default_attributes(
   :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"
     ]