Tighten mod_evasive restrictions for the main site

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 6b159b56851fb9c7af7c0082d7e6bfe0ab7ba6c4..97bd895f8d55f49ed75dcbb024a55a88ff3d8f8b 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -13,38 +13,31 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :timeout => 60,
+    :evasive => {
+      :enable => false
+    },
     :event => {
-      :server_limit => 80,
-      :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,
-      :max_spare_threads => 1200,
       :max_connections_per_child => 0,
       :async_request_worker_factor => 4,
-      :listen_cores_buckets_ratio => 6
-    }
-  },
-  :munin => {
-    :plugins => {
-      :renderd_processed => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
-        :reqPrio => { :draw => "AREA" },
-        :req => { :draw => "STACK" }
-      }
+      :listen_cores_buckets_ratio => 8
     }
   },
   :postgresql => {
     :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",
@@ -105,7 +98,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
       }