Switch equinix to use Google DNS

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 3db2ce2eb2353051489d8901ad24e80e1d8e5415..cb703ae71511b39cb172cab9e95b5a531c887b26 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -20,7 +20,8 @@ default_attributes(
       :min_spare_threads => 300,
       :max_spare_threads => 1200,
       :max_connections_per_child => 0,
-      :async_request_worker_factor => 4
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6
     }
   },
   :munin => {
@@ -67,13 +68,14 @@ default_attributes(
   },
   :tile => {
     :data => {
-      :world_boundaries => {
-        :url => "https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
-      },
       :simplified_land_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
         :refresh => true
       },
+      :simplified_water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip",
+        :refresh => true
+      },
       :admin_boundaries => {
         :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"
@@ -82,6 +84,10 @@ default_attributes(
         :url => "https://osmdata.openstreetmap.de/download/land-polygons-split-3857.zip",
         :refresh => true
       },
+      :water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip",
+        :refresh => true
+      },
       :antarctica_icesheet_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip",
         :refresh => true
@@ -94,7 +100,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.20.0",
+        :revision => "v4.24.1",
         :max_zoom => 19
       }
     }