From 9b422007465f97c7d56517cfd2db464be0bd3a98 Mon Sep 17 00:00:00 2001 From: Robin Kluth Date: Sun, 25 May 2014 11:55:14 +0200 Subject: [PATCH 1/4] Changed fpm-config var description... * start_servers not used if ondemand, same with min and max_spare_servers [http://www.php.net/manual/de/install.fpm.configuration.php#pm] --- lng/german.lng.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lng/german.lng.php b/lng/german.lng.php index 11b52a2a..774f7f1d 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1285,11 +1285,11 @@ $lng['serversettings']['phpfpm_settings']['pm'] = 'Prozess Manager Control (PM)' $lng['serversettings']['phpfpm_settings']['max_children']['title'] = 'Anzahl der Kind-Prozesse'; $lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'Die Anzahl der zu startenden Kind-Prozesse wenn PM auf \'static\' steht und die maximale Anzahl der Prozesse wenn PM auf \'dynamic/ondemand\' steht.
Equivalent zu PHP_FCGI_CHILDREN'; $lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'Anzahl der beim Starten zu erstellenden Kind-Prozesse'; -$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic/ondemand\' steht'; +$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht'; $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'Mindestanzahl der Idle-Prozesse'; -$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic/ondemand\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; +$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'Maximale Anzahl der Idle-Prozesse'; -$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic/ondemand\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; +$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests pro Kindprozess bevor Neuerstellung (respawning)'; $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'Für keine Begrenzung \'0\' angeben. Equivalent zu PHP_FCGI_MAX_REQUESTS.'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM ist derzeit aktiviert. Bitte deaktiviere es, um FCGID zu aktivieren'; From 7a8e3450840cee0b8eccc4bf7d27e5833c96d6dc Mon Sep 17 00:00:00 2001 From: Robin Kluth Date: Sun, 25 May 2014 12:01:16 +0200 Subject: [PATCH 2/4] Removed unecessary 'start_servers' if pm = ondemand http://www.php.net/manual/de/install.fpm.configuration.php#pm.start-servers --- lib/classes/phpinterface/class.phpinterface_fpm.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php index 42093a44..bc0e0ee2 100644 --- a/lib/classes/phpinterface/class.phpinterface_fpm.php +++ b/lib/classes/phpinterface/class.phpinterface_fpm.php @@ -151,7 +151,6 @@ class phpinterface_fpm { $fpm_config.= 'pm.min_spare_servers = '.$fpm_min_spare_servers."\n"; $fpm_config.= 'pm.max_spare_servers = '.$fpm_max_spare_servers."\n"; } elseif ($fpm_pm == 'ondemand') { - $fpm_config.= 'pm.start_servers = '.$fpm_start_servers."\n"; $fpm_config.= 'pm.process_idle_timeout = '.$fpm_process_idle_timeout."\n"; } From 7e1e7851cc40b8516b313baabd716fe812917ec2 Mon Sep 17 00:00:00 2001 From: Robin Kluth Date: Sun, 25 May 2014 12:04:15 +0200 Subject: [PATCH 3/4] Changed fpm-config var description... * start_servers not used if ondemand, same with min and max_spare_servers [http://www.php.net/manual/de/install.fpm.configuration.php#pm] --- lng/english.lng.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lng/english.lng.php b/lng/english.lng.php index fb436222..1f5e88ee 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1307,11 +1307,11 @@ $lng['serversettings']['phpfpm_settings']['pm'] = 'Process manager control (pm)' $lng['serversettings']['phpfpm_settings']['max_children']['title'] = 'The number of child processes'; $lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'The number of child processes to be created when pm is set to \'static\' and the maximum number of child processes to be created when pm is set to \'dynamic/ondemand\'
Equivalent to the PHP_FCGI_CHILDREN'; $lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'The number of child processes created on startup'; -$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\''; +$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\''; $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'The desired minimum number of idle server processes'; -$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\'
Note: Mandatory when pm is set to \'dynamic/ondemand\''; +$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'
Note: Mandatory when pm is set to \'dynamic\''; $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'The desired maximum number of idle server processes'; -$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\'
Note: Mandatory when pm is set to \'dynamic/ondemand\''; +$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'
Note: Mandatory when pm is set to \'dynamic\''; $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests per child before respawning'; $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'For endless request processing specify \'0\'. Equivalent to PHP_FCGI_MAX_REQUESTS.'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM is currently active. Please deactivate it before activating FCGID'; From 2376200a73eaf34e4df01976b70ab1b54a116e10 Mon Sep 17 00:00:00 2001 From: Robin Kluth Date: Sun, 25 May 2014 12:05:17 +0200 Subject: [PATCH 4/4] Whoops... --- lng/german.lng.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lng/german.lng.php b/lng/german.lng.php index 774f7f1d..cb67c51f 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1287,9 +1287,9 @@ $lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'Die $lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'Anzahl der beim Starten zu erstellenden Kind-Prozesse'; $lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht'; $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'Mindestanzahl der Idle-Prozesse'; -$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; +$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic\' steht'; $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'Maximale Anzahl der Idle-Prozesse'; -$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic/ondemand\' steht'; +$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht
Wichtig: Pflichtangabe wenn PM auf \'dynamic\' steht'; $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests pro Kindprozess bevor Neuerstellung (respawning)'; $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'Für keine Begrenzung \'0\' angeben. Equivalent zu PHP_FCGI_MAX_REQUESTS.'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM ist derzeit aktiviert. Bitte deaktiviere es, um FCGID zu aktivieren';