X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7543f8da726838ba2895388fae36d92c2b784aed..62c8abda084e509811837655ba68e99b80dfe56f:/roles/tile.rb diff --git a/roles/tile.rb b/roles/tile.rb index 8a011513e..4bc8717cd 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -6,9 +6,9 @@ default_attributes( :users => { :tile => { :status => :role, - :members => [ :jburgess, :tomh ] - }, - }, + :members => [:jburgess, :tomh] + } + } }, :apache => { :mpm => "event", @@ -22,11 +22,7 @@ default_attributes( :max_requests_per_child => 100000 } }, - :apt => { - :sources => [ "ubuntugis-stable" ] - }, :postgresql => { - :versions => [ "9.1" ], :settings => { :defaults => { :temp_buffers => "32MB", @@ -44,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", @@ -68,15 +68,23 @@ 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 + }, + :antarctica_icesheet_polygons => { + :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip", + :refresh => true + }, + :antarctica_icesheet_outlines => { + :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip", + :refresh => true } }, :styles => { :default => { :repository => "git://github.com/gravitystorm/openstreetmap-carto.git", - :revision => "v2.2.0", + :revision => "v2.37.1", :max_zoom => 19 } }