Git only checkout 1 deep

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 92af00fbcfca3fccb0a0cf5e659cddf31c5a6b24..8de66fff5b311501dbb06a1b8b57eb83758e7ee7 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -5,7 +5,6 @@ default_attributes(
   :accounts => {
     :users => {
       :tile => {
-        :status => :role,
         :members => [:jburgess, :tomh]
       }
     }
@@ -20,7 +19,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 => {
@@ -66,14 +66,19 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :style_file => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style",
+      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua"
+    },
     :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 +87,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 +103,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.22.0",
+        :revision => "v4.25.0",
         :max_zoom => 19
       }
     }