Expire tiles from both osm.gz and osc.gz files

[chef.git] / roles / gorynych.rb

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 0b035b1825558c92426c2ba75c8f7a352f348678..1d2343350abac05cef47ee3b48b13a1a3ab988cd 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -2,15 +2,33 @@ name "gorynych"
 description "Master role applied to gorynych"
 
 default_attributes(
+  :munin => {
+    :plugins => {
+      :smart_sdc => {
+        :smartctl_exit_status => { :warning => ":8" }
+      },
+      :smart_sdd => {
+        :smartctl_exit_status => { :warning => ":8" }
+      }
+    }
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "130.193.62.73",
-        :prefix => "29",
-        :gateway => "130.193.62.78"
+        :address => "5.45.248.21",
+        :prefix => "30",
+        :gateway => "5.45.248.22"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a02:6b8:b010:5065::a001",
+        :prefix => "64",
+        :gateway => "2a02:6b8:b010:5065::1"
       }
     }
   },
@@ -18,8 +36,8 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "10",
-        "block/md0/md/sync_speed_max" => "10000"
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000"
       }
     }
   },
@@ -30,9 +48,11 @@ default_attributes(
   :tilecache => {
     :tile_parent => "moscow.render.openstreetmap.org",
     :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
       "nepomuk.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "fume.openstreetmap.org"
+      "ridgeback.openstreetmap.org"
     ]
   }
 )