Merge pull request #277 from Firefishy/fully-resolve-planet-links-for-mirrors

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index fa36a41ff6c1fafb4edd1b9023ea23a6d2e93943..9881886e75282179ad1e2e1cef83d87f5249b915 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -5,7 +5,6 @@ default_attributes(
   :accounts => {
     :users => {
       :tile => {
-        :status => :role,
         :members => [:jburgess, :tomh]
       }
     }
@@ -20,7 +19,8 @@ default_attributes(
       :min_spare_threads => 300,
       :max_spare_threads => 1200,
       :max_connections_per_child => 0,
-      :async_request_worker_factor => 4
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6
     }
   },
   :munin => {
@@ -35,6 +35,7 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
+        :max_connections => "250",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
@@ -65,12 +66,17 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :style_file => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style",
+      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua"
+    },
     :data => {
-      :world_boundaries => {
-        :url => "https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
-      },
       :simplified_land_polygons => {
-        :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
+        :refresh => true
+      },
+      :simplified_water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip",
         :refresh => true
       },
       :admin_boundaries => {
@@ -78,22 +84,26 @@ default_attributes(
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
       :land_polygons => {
-        :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/land-polygons-split-3857.zip",
+        :refresh => true
+      },
+      :water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip",
         :refresh => true
       },
       :antarctica_icesheet_polygons => {
-        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip",
         :refresh => true
       },
       :antarctica_icesheet_outlines => {
-        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-outlines-3857.zip",
         :refresh => true
       }
     },
     :styles => {
       :default => {
-        :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.9.0",
+        :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
+        :revision => "v4.25.0",
         :max_zoom => 19
       }
     }