tilecache: reject request without user-agent (try2)

[chef.git] / roles / katie.rb

diff --git a/roles/katie.rb b/roles/katie.rb
index ff9c9ab53a0aafc4c295ba90ecd832a93361dced..9f1ce770275c7a1623b5fc7220d863249a77128a 100644 (file)
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -2,6 +2,18 @@ name "katie"
 description "Master role applied to katie"
 
 default_attributes(
 description "Master role applied to katie"
 
 default_attributes(

+  :devices => {
+    :disktune => {
+      :comment => "Tune scheduler for Toshiba disks",
+      :type => "block",
+      :bus => "ata",
+      :serial => "TOSHIBA_DT01ACA300_*",
+      :attrs => {
+        "queue/scheduler" => "deadline"
+      }
+    }
+  },
+  :location => "Falkenstein, Germany",

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


@@ -29,19 +41,15 @@ default_attributes(
   :tilecache => {
     :tile_parent => "germany.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "germany.render.openstreetmap.org",
     :tile_siblings => [

-       "tabaluga.openstreetmap.org",
-       "konqi.openstreetmap.org",
-       "trogdor.openstreetmap.org",
-       "nepomuk.openstreetmap.org",
-       "ridgeback.openstreetmap.org",
-       "fume.openstreetmap.org",
-       "gorynych.openstreetmap.org",
-       "simurgh.openstreetmap.org"
+      "kalessin.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "keizer.openstreetmap.org"

     ]
   }
 )
 
 run_list(
   "role[hetzner]",
     ]
   }
 )
 
 run_list(
   "role[hetzner]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )