Drop unused brightbox-ruby-ng repository from ridley

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 26cd98e5879d15b3134f40e3f3fc2025314367ff..9065969c0de9ef6c04b53c98dd6850eb6858e932 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -17,9 +17,10 @@ default_attributes(
       :server_limit => 60,
       :max_request_workers => 1200,
       :threads_per_child => 20,
-      :min_spare_threads => 30,
-      :max_spare_threads => 180,
-      :max_connections_per_child => 100000
+      :min_spare_threads => 300,
+      :max_spare_threads => 1200,
+      :max_connections_per_child => 0,
+      :async_request_worker_factor => 4
     }
   },
   :munin => {
@@ -34,6 +35,7 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
+        :max_connections => "250",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
@@ -41,7 +43,10 @@ default_attributes(
         :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"
       }
     }
   },
@@ -63,7 +68,7 @@ default_attributes(
   :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 => {
         :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip",
@@ -89,7 +94,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.44.1",
+        :revision => "v4.14.0",
         :max_zoom => 19
       }
     }