Disable chef status alerts for nodes known to be down

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 1341ef67033b37a845f3525bf8ba82a778b50711..64691ae91072523778275fa84eba09f486c5576d 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,9 +6,9 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
-        :members => [ :jburgess, :tomh ]
-      },
-    },
+        :members => [:jburgess, :tomh]
+      }
+    }
   },
   :apache => {
     :mpm => "event",
@@ -22,11 +22,7 @@ default_attributes(
       :max_requests_per_child => 100000
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable" ]
-  },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
@@ -54,9 +50,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "9.1/main"
-    },
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
@@ -78,12 +71,20 @@ default_attributes(
       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true
+      },
+      :antarctica_icesheet_polygons => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip",
+        :refresh => true
+      },
+      :antarctica_icesheet_outlines => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip",
+        :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.20.1",
+        :revision => "v2.34.0",
         :max_zoom => 19
       }
     }