Improve handling of apache mpm selection

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index c4b0834d1e1f28265bf974ac0d7901f5372caf9b..f089d08b2574121287bb8327b924e0cbac325d05 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -11,7 +11,7 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "event",
+    :mpms => ["event"],
     :timeout => 60,
     :event => {
       :server_limit => 60,
@@ -64,13 +64,6 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
-    },
-    :tcp_use_bbr => {
-      :comment => "Use TCP BBR Congestion Control",
-      :parameters => {
-        "net.core.default_qdisc" => "fq",
-        "net.ipv4.tcp_congestion_control" => "bbr"
-      }
     }
   },
   :tile => {
@@ -107,7 +100,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.24.1",
+        :revision => "v4.25.0",
         :max_zoom => 19
       }
     }