maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

move a long, these are not the changes you are looking for

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-28 10:44:59 +02:00
parent d2c142c07e
commit 93ba24374b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
actions/admin/settings/136.phpfpm.php
View File

@@ -83,15 +83,15 @@ return array(
'default' => '/etc/php-fpm.d/', 'default' => '/etc/php-fpm.d/',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
'system_phpfpm_aliasconfigdir' => array( 'system_phpfpm_aliasconfigdir' => array(
'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'], 'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'],
'settinggroup' => 'phpfpm', 'settinggroup' => 'phpfpm',
'varname' => 'aliasconfigdir', 'varname' => 'aliasconfigdir',
'type' => 'string', 'type' => 'string',
'string_type' => 'dir', 'string_type' => 'dir',
'default' => '/var/www/php-fpm/', 'default' => '/var/www/php-fpm/',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
), ),
'system_phpfpm_tmpdir' => array( 'system_phpfpm_tmpdir' => array(
'label' => $lng['serversettings']['mod_fcgid']['tmpdir'], 'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
'settinggroup' => 'phpfpm', 'settinggroup' => 'phpfpm',

2
lib/classes/phpinterface/class.phpinterface_fpm.php
View File

@@ -163,7 +163,7 @@ class phpinterface_fpm
$fpm_config.= 'pm.max_spare_servers = '.$fpm_max_spare_servers."\n"; $fpm_config.= 'pm.max_spare_servers = '.$fpm_max_spare_servers."\n";
} elseif ($fpm_pm == 'ondemand') { } elseif ($fpm_pm == 'ondemand') {
$fpm_config.= 'pm.start_servers = '.$fpm_start_servers."\n"; $fpm_config.= 'pm.start_servers = '.$fpm_start_servers."\n";
$fpm_config.= 'pm.process_idle_timeout = '.$fpm_process_idle_timeout."\n"; $fpm_config.= 'pm.process_idle_timeout = '.$fpm_process_idle_timeout."\n";
} }
$fpm_config.= 'pm.max_requests = '.$fpm_requests."\n"; $fpm_config.= 'pm.max_requests = '.$fpm_requests."\n";