Update piwik to 3.13.2

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index b0f7c930e6b1ca5892dff1d5b04dd06db63cc45b..9061e2bce33067d0745c9a07520dd985d80566e6 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -20,7 +20,8 @@ default_attributes(
       :min_spare_threads => 300,
       :max_spare_threads => 1200,
       :max_connections_per_child => 0,
       :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 => {
     }
   },
   :munin => {


@@ -35,6 +36,7 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {

+        :max_connections => "250",

         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",


@@ -66,11 +68,12 @@ default_attributes(
   },
   :tile => {
     :data => {
   },
   :tile => {
     :data => {

-      :world_boundaries => {
-        :url => "https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
-      },

       :simplified_land_polygons => {
       :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 => {
         :refresh => true
       },
       :admin_boundaries => {


@@ -78,22 +81,26 @@ default_attributes(
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
       :land_polygons => {
         :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 => {
         :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 => {
         :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",
         :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v4.7.1",
+        :revision => "v4.25.0",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }