diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php index be0e9258..1930bd8e 100644 --- a/actions/admin/settings/136.phpfpm.php +++ b/actions/admin/settings/136.phpfpm.php @@ -119,7 +119,7 @@ return array( 'type' => 'option', 'default' => 'static', 'option_mode' => 'one', - 'option_options' => array('static' => 'static', 'dynamic' => 'dynamic'), + 'option_options' => array('static' => 'static', 'dynamic' => 'dynamic', 'ondemand' => 'ondemand'), 'save_method' => 'storeSettingField', ), 'system_phpfpm_max_children' => array( diff --git a/lib/classes/phpinterface/class.phpinterface_fpm.php b/lib/classes/phpinterface/class.phpinterface_fpm.php index 1dfc0ddf..44d6c85d 100644 --- a/lib/classes/phpinterface/class.phpinterface_fpm.php +++ b/lib/classes/phpinterface/class.phpinterface_fpm.php @@ -93,7 +93,7 @@ class phpinterface_fpm $fpm_config.= 'pm = '.$fpm_pm."\n"; $fpm_config.= 'pm.max_children = '.$fpm_children."\n"; - if($fpm_pm == 'dynamic') { + if($fpm_pm == 'dynamic' || $fpm_pm == 'ondemand') { $fpm_config.= 'pm.start_servers = '.$fpm_start_servers."\n"; $fpm_config.= 'pm.min_spare_servers = '.$fpm_min_spare_servers."\n"; $fpm_config.= 'pm.max_spare_servers = '.$fpm_max_spare_servers."\n"; diff --git a/lng/english.lng.php b/lng/english.lng.php index ed32a83a..ccf81c12 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1530,13 +1530,13 @@ $lng['serversettings']['phpfpm_settings']['aliasconfigdir'] = 'Configuration Ali $lng['serversettings']['phpfpm_settings']['reload'] = 'php-fpm restart command'; $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\'
Equivalent to the PHP_FCGI_CHILDREN'; +$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\''; +$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\''; $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\'
Note: Mandatory when pm is set to \'dynamic\''; +$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/ondemand\''; $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\'
Note: Mandatory when pm is set to \'dynamic\''; +$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/ondemand\''; $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'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 84fcddcb..6ba0f2ce 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1511,13 +1511,13 @@ $lng['serversettings']['phpfpm_settings']['configdir'] = 'Pfad zu php-fpm Konfig $lng['serversettings']['phpfpm_settings']['reload'] = 'Kommando zum Neustarten von php-fpm'; $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\' steht.
Equivalent zu PHP_FCGI_CHILDREN'; +$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\' steht'; +$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic/ondemand\' 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\' steht'; +$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']['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\' steht'; +$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_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';