Rely on max_connections set in attributes

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index ac642a758e6c0d88419a7ebda46df652baf8f4bc..20bded97ff13fd0d2fcf2f6161408dc91950244d 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -13,6 +13,9 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :timeout => 60,
+    :evasive => {
+      :enable => false
+    },
     :event => {
       :threads_per_child => 20,
       :min_spare_threads => 300,
@@ -21,15 +24,6 @@ default_attributes(
       :listen_cores_buckets_ratio => 8
     }
   },
-  :munin => {
-    :plugins => {
-      :renderd_processed => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
-        :reqPrio => { :draw => "AREA" },
-        :req => { :draw => "STACK" }
-      }
-    }
-  },
   :postgresql => {
     :settings => {
       :defaults => {
@@ -104,8 +98,9 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v5.7.0",
+        :revision => "v5.9.0",
         :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
+        :functions_script => "/srv/tile.openstreetmap.org/styles/default/functions.sql",
         :max_zoom => 19
       }
     }