From: Grant Slater <git@firefishy.com>
Date: Sun, 16 Aug 2020 01:21:05 +0000 (+0100)
Subject: php-fpm tune for wiki
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/e49218f4d5a297a8a5ccf5998df62ce4e66e6a65

php-fpm tune for wiki
---

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 472e8c3d8..424d4288a 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -44,6 +44,7 @@ property :recaptcha_public_key, :kind_of => String
 property :recaptcha_private_key, :kind_of => String
 property :extra_file_extensions, :kind_of => [String, Array], :default => []
 property :fpm_max_children, :kind_of => Integer, :default => 5
+property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 300
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
@@ -521,6 +522,7 @@ action :create do
 
   php_fpm new_resource.site do
     pm_max_children new_resource.fpm_max_children
+    request_terminate_timeout new_resource.fpm_request_terminate_timeout
     php_admin_values "open_basedir" => "#{site_directory}/:/usr/share/php/:/dev/null:/tmp/"
     php_values "memory_limit" => "500M",
                "max_execution_time" => "240",
diff --git a/roles/wiki.rb b/roles/wiki.rb
index acd0cef1c..be9510f70 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,7 +8,14 @@ default_attributes(
     }
   },
   :apache => {
-    :timeout => 30
+    :mpm => "event",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    }
   },
   :elasticsearch => {
     :version => "5.x",