Make sure cgimap uses the writable database for updates

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 8b86f9965a3a0be80abe4eeeb9ed109bc6b1848d..3db2ce2eb2353051489d8901ad24e80e1d8e5415 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -35,6 +35,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",


@@ -42,7 +43,10 @@ default_attributes(
         :commit_delay => "10000",
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
         :commit_delay => "10000",
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",

-        :track_activity_query_size => "16384"
+        :random_page_cost => "1.1",
+        :track_activity_query_size => "16384",
+        :autovacuum_vacuum_scale_factor => "0.05",
+        :autovacuum_analyze_scale_factor => "0.02"

       }
     }
   },
       }
     }
   },


@@ -64,10 +68,10 @@ default_attributes(
   :tile => {
     :data => {
       :world_boundaries => {
   :tile => {
     :data => {
       :world_boundaries => {

-        :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
+        :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
       },
       :admin_boundaries => {
         :refresh => true
       },
       :admin_boundaries => {


@@ -75,22 +79,22 @@ 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
       },
       :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.1.0",
+        :revision => "v4.20.0",

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