Enable CSP in report only mode for the main web site

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 5743bd8016849d3a6ebccd65456a3bf9d499b548..fe08c49a8646912413394bb4ecf5cafefb16c3c5 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,11 +15,21 @@ 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
+      :min_spare_threads => 300,
+      :max_spare_threads => 1200,
+      :max_connections_per_child => 0,
+      :async_request_worker_factor => 4
+    }
+  },
+  :munin => {
+    :plugins => {
+      :renderd_processed => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
+        :reqPrio => { :draw => "AREA" },
+        :req => { :draw => "STACK" }
+      }
     }
   },
   :postgresql => {
@@ -30,7 +40,9 @@ default_attributes(
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB",
+        :track_activity_query_size => "16384"
       }
     }
   },
@@ -78,7 +90,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.39.0",
+        :revision => "v4.5.0",
         :max_zoom => 19
       }
     }