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

Merge pull request #43 from RipClaw2971/master

Browse Source 
fixes #1118 FastCgiExternalServer: redefinition of previously defined class, thx RipClaw2971
This commit is contained in:
Florian Aders
2012-09-25 00:25:48 -07:00
parent 24fb46b3d7 e6a30edd0b
commit 30b185825c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -374,7 +374,7 @@ class apache
* We put together the needed php options in the virtualhost entries
*/
protected function composePhpOptions($domain)
protected function composePhpOptions($domain, $ssl_vhost = false)
{
$php_options_text = '';
@@ -843,7 +843,7 @@ class apache
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true);
$vhost_content.= $this->getWebroot($domain);
if ($this->_deactivated == false) {
$vhost_content.= $this->composePhpOptions($domain);
$vhost_content.= $this->composePhpOptions($domain,$ssl_vhost);
$vhost_content.= $this->getStats($domain);
}
$vhost_content.= $this->getLogfiles($domain);

14
scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -26,7 +26,7 @@ if(@php_sapi_name() != 'cli'
class apache_fcgid extends apache
{
protected function composePhpOptions($domain)
protected function composePhpOptions($domain, $ssl_vhost = false)
{
$php_options_text = '';
@@ -38,7 +38,11 @@ class apache_fcgid extends apache
if((int)$this->settings['phpfpm']['enabled'] == 1)
{
$php_options_text.= ' SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
$php_options_text.= ' FastCgiExternalServer ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
if ($domain['ssl'] == 1 && $ssl_vhost) {
$php_options_text.= ' FastCgiExternalServer ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'ssl-fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
} else {
$php_options_text.= ' FastCgiExternalServer ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
}
$php_options_text.= ' <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
$php_options_text.= ' <FilesMatch "\.php$">' . "\n";
$php_options_text.= ' SetHandler php5-fastcgi'. "\n";
@@ -48,7 +52,11 @@ class apache_fcgid extends apache
$php_options_text.= ' Order allow,deny' . "\n";
$php_options_text.= ' allow from all' . "\n";
$php_options_text.= ' </Directory>' . "\n";
$php_options_text.= ' Alias /fastcgiphp ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'fpm.external' . "\n";
if ($domain['ssl'] == 1 && $ssl_vhost) {
$php_options_text.= ' Alias /fastcgiphp ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'ssl-fpm.external' . "\n";
} else {
$php_options_text.= ' Alias /fastcgiphp ' . makeCorrectDir($php->getInterface()->getAliasConfigDir()) . 'fpm.external' . "\n";
}
}
else
{