From a0a7f905806cea4a97b2121adfee1beb995a1d61 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 2 Nov 2020 13:35:44 +0000 Subject: [PATCH] Tune FPM configuration for the wiki --- cookbooks/mediawiki/resources/site.rb | 6 ++++++ cookbooks/wiki/recipes/default.rb | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 90527e740..2fc1ed115 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -44,6 +44,9 @@ 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_start_servers, :kind_of => Integer, :default => 2 +property :fpm_min_spare_servers, :kind_of => Integer, :default => 1 +property :fpm_max_spare_servers, :kind_of => Integer, :default => 3 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 300 property :fpm_prometheus_port, :kind_of => Integer property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true @@ -522,6 +525,9 @@ action :create do php_fpm new_resource.site do pm_max_children new_resource.fpm_max_children + pm_start_servers new_resource.fpm_start_servers + pm_min_spare_servers new_resource.fpm_min_spare_servers + pm_max_spare_servers new_resource.fpm_max_spare_servers 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", diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index e75763af1..72af19cb8 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -33,7 +33,10 @@ mediawiki_site "wiki.openstreetmap.org" do "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] directory "/srv/wiki.openstreetmap.org" - fpm_max_children 25 + fpm_max_children 50 + fpm_start_servers 10 + fpm_min_spare_servers 10 + fpm_max_spare_servers 20 fpm_prometheus_port 9253 database_name "wiki" -- 2.43.2