Add apache mime type mapping for xz files

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index 8205b3c32c7a1799423fa200d6818e72d579e855..e2e35be2905365363a95658e3891bf591768d8e7 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -2,6 +2,13 @@ name "fume"
 description "Master role applied to fume"
 
 default_attributes(
 description "Master role applied to fume"
 
 default_attributes(

+  :munin => {
+    :plugins => {
+      :df => {
+        :_dev_cciss_c0d1p1 => { :warning => ":95" }
+      }
+    }
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -31,15 +38,20 @@ default_attributes(
       :parameters => {
         "block/cciss\!c0d0/queue/nr_requests" => "512",
         "block/cciss\!c0d1/queue/nr_requests" => "512",
       :parameters => {
         "block/cciss\!c0d0/queue/nr_requests" => "512",
         "block/cciss\!c0d1/queue/nr_requests" => "512",

-       "block/cciss\!c0d0/queue/scheduler" => "noop",
-       "block/cciss\!c0d1/queue/scheduler" => "noop"
+        "block/cciss\!c0d0/queue/scheduler" => "noop",
+        "block/cciss\!c0d1/queue/scheduler" => "noop"

       }
     }
   },
   :tilecache => {
     :tile_parent => "sjobo.render.openstreetmap.org",
     :tile_siblings => [
       }
     }
   },
   :tilecache => {
     :tile_parent => "sjobo.render.openstreetmap.org",
     :tile_siblings => [

-      "trogdor.openstreetmap.org"
+      "trogdor.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "nepomuk.openstreetmap.org"

     ]
   }
 )
     ]
   }
 )