Update carto stylesheet to v2.26.0

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index c9338173a78e5a74127fff0bc02643035c601ebc..aa60664f49d7d9698475f0501503b5cd5c09a219 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -10,6 +10,18 @@ default_attributes(
       },
     },
   },
+  :apache => {
+    :mpm => "event",
+    :timeout => 60,
+    :event => {
+      :server_limit => 60,
+      :max_clients => 1200,
+      :threads_per_child => 20,
+      :min_spare_threads => 30,
+      :max_spare_threads => 180,
+      :max_requests_per_child => 100000
+    }
+  },
   :apt => {
     :sources => [ "ubuntugis-stable" ]
   },
@@ -32,6 +44,13 @@ default_attributes(
       :parameters => {
         "net.core.somaxconn" => 10000
       }
+    },
+    :kernel_scheduler_tune => {
+      :comment => "Tune kernel scheduler preempt",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
     }
   },
   :tile => {
@@ -42,9 +61,9 @@ default_attributes(
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
       },
-      :shoreline => {
-        :url => "http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2",
-        :directory => "shoreline_300"
+      :simplified_land_polygons => {
+        :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-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",
@@ -56,15 +75,15 @@ default_attributes(
         :original => "ne_10m_populated_places.shp",
         :processed => "ne_10m_populated_places_fixed.shp"
       },
-      :processed => {
-        :url => "http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2",
-        :directory => "processed_p"
+      :land_polygons => {
+        :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
+        :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.2.0",
+        :revision => "v2.26.0",
         :max_zoom => 19
       }
     }