From 73f885394ee2a3af5a9d4cb67f770c5ad4d3f33b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 28 Jun 2022 23:07:48 +0200 Subject: [PATCH] Fix php-fpm that were on-demand instead of dynamic --- .../private/system/quatresaisons/nextcloud.nix | 5 ++++- modules/private/websites/denise/evariste.nix | 16 ++++++++++------ .../private/websites/emilia/atelierfringant.nix | 8 +++++--- modules/private/websites/leila/production.nix | 8 +++++--- .../private/websites/patrick_fodella/ecolyeu.nix | 8 +++++--- .../websites/ressourcerie_banon/production.nix | 8 +++++--- modules/private/websites/richie/production.nix | 8 +++++--- .../private/websites/telio_tortay/production.nix | 8 +++++--- 8 files changed, 44 insertions(+), 25 deletions(-) diff --git a/modules/private/system/quatresaisons/nextcloud.nix b/modules/private/system/quatresaisons/nextcloud.nix index 2f6aafd..d02f916 100644 --- a/modules/private/system/quatresaisons/nextcloud.nix +++ b/modules/private/system/quatresaisons/nextcloud.nix @@ -11,7 +11,10 @@ let pool = { "listen.owner" = "wwwrun"; "listen.group" = "wwwrun"; - "pm" = "ondemand"; + "pm" = "dynamic"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "pm.max_children" = "60"; "pm.process_idle_timeout" = "60"; diff --git a/modules/private/websites/denise/evariste.nix b/modules/private/websites/denise/evariste.nix index 42f9b2e..df4e917 100644 --- a/modules/private/websites/denise/evariste.nix +++ b/modules/private/websites/denise/evariste.nix @@ -29,9 +29,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/denise_nsievariste:${nsiVarDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/denise_nsievariste"; @@ -69,9 +71,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/denise_stmgevariste:${stmgVarDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/denise_stmgevariste"; diff --git a/modules/private/websites/emilia/atelierfringant.nix b/modules/private/websites/emilia/atelierfringant.nix index b47452f..518554b 100644 --- a/modules/private/websites/emilia/atelierfringant.nix +++ b/modules/private/websites/emilia/atelierfringant.nix @@ -24,9 +24,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/emilia:${varDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/emilia"; diff --git a/modules/private/websites/leila/production.nix b/modules/private/websites/leila/production.nix index 8385bc7..96ba8cb 100644 --- a/modules/private/websites/leila/production.nix +++ b/modules/private/websites/leila/production.nix @@ -15,9 +15,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "${varDir}:/tmp"; "php_admin_value[max_execution_time]" = "1800"; diff --git a/modules/private/websites/patrick_fodella/ecolyeu.nix b/modules/private/websites/patrick_fodella/ecolyeu.nix index 00dab76..d908e78 100644 --- a/modules/private/websites/patrick_fodella/ecolyeu.nix +++ b/modules/private/websites/patrick_fodella/ecolyeu.nix @@ -25,9 +25,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/patrick_fodella_ecolyeu:${varDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/patrick_fodella_ecolyeu"; diff --git a/modules/private/websites/ressourcerie_banon/production.nix b/modules/private/websites/ressourcerie_banon/production.nix index a3abcca..e68f7db 100644 --- a/modules/private/websites/ressourcerie_banon/production.nix +++ b/modules/private/websites/ressourcerie_banon/production.nix @@ -25,9 +25,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/ressourcerie_banon:${varDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/ressourcerie_banon"; diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix index a548cff..10a7be9 100644 --- a/modules/private/websites/richie/production.nix +++ b/modules/private/websites/richie/production.nix @@ -59,9 +59,11 @@ in "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "${vardir}:/var/lib/php/sessions/richie_production:${secretPath}:${richieSrc}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/richie_production"; diff --git a/modules/private/websites/telio_tortay/production.nix b/modules/private/websites/telio_tortay/production.nix index fc1e9a2..8cae3bc 100644 --- a/modules/private/websites/telio_tortay/production.nix +++ b/modules/private/websites/telio_tortay/production.nix @@ -30,9 +30,11 @@ in { "listen.owner" = apacheUser; "listen.group" = apacheGroup; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; "php_admin_value[open_basedir]" = "/var/lib/php/sessions/telio_tortay:${varDir}:/tmp"; "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio_tortay"; -- 2.41.0