put db back in normal mode on pummelzacken

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 560ce52c483056ac42c789784d5c4c9165fc4256..1341ef67033b37a845f3525bf8ba82a778b50711 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -14,9 +14,9 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
+      :server_limit => 60,
       :max_clients => 1200,
       :threads_per_child => 20,
-      :server_limit => 40,
       :min_spare_threads => 30,
       :max_spare_threads => 180,
       :max_requests_per_child => 100000
@@ -44,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 => {
@@ -54,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",
@@ -68,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.20.1",
         :max_zoom => 19
       }
     }