Drop memache configuration for gpx-import

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index fb5c467a492e9a312162f5e0421893e7c52eb245..5743bd8016849d3a6ebccd65456a3bf9d499b548 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -62,21 +62,23 @@ default_attributes(
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },

-      :populated_places => {
-        :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip",
-        :directory => "ne_10m_populated_places",
-        :original => "ne_10m_populated_places.shp",
-        :processed => "ne_10m_populated_places_fixed.shp"
-      },

       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true
       :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",
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.29.1",
+        :revision => "v2.39.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }