Rename piwik to matomo

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 82dcc21baa9c200821c7aac4d3eaa0a490629868..ea8b27daf1fbfb913673792625acbe4969ce5ab8 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -13,7 +13,7 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
-      :server_limit => 60,
+      :server_limit => 80,
       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,
@@ -62,11 +62,16 @@ default_attributes(
         "net.core.somaxconn" => 10000
       }
     },
-    :kernel_scheduler_tune => {
-      :comment => "Tune kernel scheduler preempt",
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
       :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "524288"
       }
     },
     :no_tcp_slow_start => {
@@ -81,7 +86,7 @@ default_attributes(
         "net.core.default_qdisc" => "fq",
         "net.ipv4.tcp_congestion_control" => "bbr"
       }
-    },
+    }
   },
   :tile => {
     :database => {
@@ -99,7 +104,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v5.3.1",
+        :revision => "v5.5.1",
         :max_zoom => 19
       }
     }