added new config option for php fpm fixes #1089

This commit is contained in:
blackice2999
2012-05-08 23:12:51 +02:00
parent 1e68766b54
commit 173e40b0e4
6 changed files with 51 additions and 28 deletions

View File

@@ -243,12 +243,11 @@ class phpinterface_fpm
public function getAliasConfigDir($createifnotexists = true)
{
// ensure default...
if (!isset($this->_settings['system']['phpfpm_aliasconfigdir'])) {
$this->_settings['system']['phpfpm_aliasconfigdir'] = '/var/www/php-fpm';
if (!isset($this->_settings['phpfpm']['aliasconfigdir'])) {
$this->_settings['phpfpm']['aliasconfigdir'] = '/var/www/php-fpm';
}
$configdir = makeCorrectDir($this->_settings['system']['phpfpm_aliasconfigdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
$configdir = makeCorrectDir($this->_settings['phpfpm']['aliasconfigdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
if(!is_dir($configdir) && $createifnotexists)
{
safe_exec('mkdir -p ' . escapeshellarg($configdir));