X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19444e3447c11b90b2908cd5cb6790bd55b0fc86..1f810b08e0bf0d0739ae7a0ae0f4da29809d181f:/roles/tile.rb?ds=sidebyside

diff --git a/roles/tile.rb b/roles/tile.rb
index 6c7da5a01..c4b0834d1 100644
--- 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,
-      :async_request_worker_factor => 4
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6
     }
   },
   :munin => {
@@ -35,6 +36,7 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
+        :max_connections => "250",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
@@ -43,7 +45,9 @@ default_attributes(
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
         :random_page_cost => "1.1",
-        :track_activity_query_size => "16384"
+        :track_activity_query_size => "16384",
+        :autovacuum_vacuum_scale_factor => "0.05",
+        :autovacuum_analyze_scale_factor => "0.02"
       }
     }
   },
@@ -60,15 +64,23 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :tcp_use_bbr => {
+      :comment => "Use TCP BBR Congestion Control",
+      :parameters => {
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
+      }
     }
   },
   :tile => {
     :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 => {
@@ -76,22 +88,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.7.1",
+        :revision => "v4.24.1",
         :max_zoom => 19
       }
     }