X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e1f2f40ace7f93fc3897ab90000af153976a807d..4efdff5fc79e2d9452928d187b97bf65fb920475:/roles/tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 5abf673e3..ffd69239d 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -11,12 +11,12 @@ default_attributes(
     },
   },
   :apache => {
-    :mpm => "worker",
+    :mpm => "event",
     :timeout => 60,
-    :worker => {
-      :server_limit => 48,
+    :event => {
+      :server_limit => 60,
       :max_clients => 1200,
-      :threads_per_child => 25,
+      :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,
       :max_requests_per_child => 100000
@@ -54,9 +54,8 @@ 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"
       },
       :admin_boundaries => {
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
@@ -68,15 +67,14 @@ 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"
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.2.0",
+        :revision => "v2.3.2",
         :max_zoom => 19
       }
     }