tilecache: reject common tile scrapers

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index 1a837c1a8e2816bf7f934aceb0793915b5f21ee0..2a834b101415d0813a0f45c16889e07e1ef4b56e 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -6,8 +6,8 @@ default_attributes(
     :ssdvol1tune => {
       :comment => "Tune scheduler for SSD",
       :type => "block",
-      :bus => "scsi",
-      :serial => "SATA_Samsung_SSD_840S12SNEAD411116P",
+      :bus => "ata",
+      :serial => "Samsung_SSD_840_PRO_Series_S12SNEAD411116P",
       :attrs => {
         "queue/scheduler" => "noop",
         "queue/nr_requests" => "256"
@@ -16,8 +16,8 @@ default_attributes(
     :ssdvol2tune => {
       :comment => "Tune scheduler for SSD",
       :type => "block",
-      :bus => "scsi",
-      :serial => "SATA_Samsung_SSD_840S12SNEAD411110E",
+      :bus => "ata",
+      :serial => "Samsung_SSD_840_PRO_Series_S12SNEAD411110E",
       :attrs => {
         "queue/scheduler" => "noop",
         "queue/nr_requests" => "256"
@@ -47,7 +47,7 @@ default_attributes(
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "2001b4d2031365276",
+      :serial => "2001b4d2060246956",
       :attrs => {
         "queue/scheduler" => "deadline",
         "queue/nr_requests" => "512"
@@ -113,8 +113,15 @@ default_attributes(
     }
   },
   :tile => {
-    :tile_directory => "/store/tiles",
-    :node_file => "/store/database/nodes"
+    :node_file => "/store/database/nodes",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
+          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )