Enable mod_evasive for all apache instances except render servers

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 6bb3dc9023f340283e70f1fc77e14d50a3562743..4c47704dcc378bbeae2361878565d2ba218ba160 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -13,6 +13,7 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :timeout => 60,
+    :evasive => false,
     :event => {
       :threads_per_child => 20,
       :min_spare_threads => 300,
@@ -34,14 +35,16 @@ default_attributes(
     :settings => {
       :defaults => {
         :max_connections => "250",
-        :temp_buffers => "32MB",
+        :shared_buffers => "16GB",
         :work_mem => "128MB",
+        :maintenance_work_mem => "8GB",
         :max_parallel_workers_per_gather => "0",
         :wal_level => "minimal",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
+        :checkpoint_timeout => "60min",
         :commit_delay => "10000",
-        :max_wal_size => "2880MB",
+        :max_wal_size => "10GB",
         :max_wal_senders => "0",
         :jit => "off",
         :track_activity_query_size => "16384",
@@ -102,7 +105,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v5.7.0",
+        :revision => "v5.8.0",
         :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }