X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..b8b2a707aaa8b0b726a0bf181766901a4b5b8030:/roles/tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index cc5a1ba56..eddc48533 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,15 +6,23 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
-        :members => [ :jburgess, :tomh ]
-      },
-    },
+        :members => [:jburgess, :tomh]
+      }
+    }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable" ]
+  :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
+    }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
@@ -32,19 +40,23 @@ 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 => {
-    :database => {
-      :cluster => "9.1/main"
-    },
     :data => {
       :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 +68,16 @@ 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.30.0",
+        :max_zoom => 19
       }
     }
   }