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

diff --git a/roles/tile.rb b/roles/tile.rb
index ffd69239d..433805feb 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",
@@ -34,7 +30,8 @@ default_attributes(
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB"
       }
     }
   },
@@ -44,37 +41,45 @@ 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"
       },
       :simplified_land_polygons => {
-        :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip"
+        :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",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
-      :populated_places => {
-        :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip",
-        :directory => "ne_10m_populated_places",
-        :original => "ne_10m_populated_places.shp",
-        :processed => "ne_10m_populated_places_fixed.shp"
-      },
       :land_polygons => {
-        :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip"
+        :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.3.2",
+        :revision => "v2.42.0",
         :max_zoom => 19
       }
     }