Set nomerge for nvme6n1 on karm

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 2ab8769cee3d1e7f796d88accff8e85f4435db60..26cd98e5879d15b3134f40e3f3fc2025314367ff 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,23 +15,19 @@ default_attributes(
     :timeout => 60,
     :event => {
       :server_limit => 60,
-      :max_clients => 1200,
+      :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,
-      :max_requests_per_child => 100000
+      :max_connections_per_child => 100000
     }
   },
   :munin => {
     :plugins => {
       :renderd_processed => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk dropped"
-      },
-      :renderd_queue => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk"
-      },
-      :renderd_queue_time => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk"
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
+        :reqPrio => { :draw => "AREA" },
+        :req => { :draw => "STACK" }
       }
     }
   },
@@ -44,7 +40,8 @@ default_attributes(
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
         :checkpoint_segments => "60",
-        :max_wal_size => "2880MB"
+        :max_wal_size => "2880MB",
+        :track_activity_query_size => "16384"
       }
     }
   },
@@ -92,7 +89,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.43.0",
+        :revision => "v2.44.1",
         :max_zoom => 19
       }
     }