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

migrating more files to new Settings-class makes me dance, refs #1325

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2013-12-15 15:51:25 +01:00
parent e7c53e4abb
commit 121669ee69
15 changed files with 1107 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class apache_fcgid extends apache
$php = new phpinterface($domain);
$phpconfig = $php->getPhpConfig((int)$domain['phpsettingid']);
if((int)$this->settings['phpfpm']['enabled'] == 1)
if((int)Settings::Get('phpfpm.enabled') == 1)
{
$srvName = 'fpm.external';
if ($domain['ssl'] == 1 && $ssl_vhost) {
@@ -39,7 +39,7 @@ class apache_fcgid extends apache
if (customerHasPerlEnabled($domain['customerid'])) {
$php_options_text.= ' SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
}
$php_options_text.= ' FastCgiExternalServer ' . $php->getInterface()->getAliasConfigDir() . $srvName . ' -socket ' . $php->getInterface()->getSocketFile() . ' -idle-timeout ' . $this->settings['phpfpm']['idle_timeout'] . "\n";
$php_options_text.= ' FastCgiExternalServer ' . $php->getInterface()->getAliasConfigDir() . $srvName . ' -socket ' . $php->getInterface()->getSocketFile() . ' -idle-timeout ' . Settings::Get('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";
@@ -47,7 +47,7 @@ class apache_fcgid extends apache
$php_options_text.= ' Options +ExecCGI' . "\n";
$php_options_text.= ' </FilesMatch>' . "\n";
// >=apache-2.4 enabled?
if ($this->settings['system']['apache24'] == '1') {
if (Settings::Get('system.apache24') == '1') {
$php_options_text.= ' Require all granted' . "\n";
} else {
$php_options_text.= ' Order allow,deny' . "\n";
@@ -58,8 +58,8 @@ class apache_fcgid extends apache
}
else
{
$php_options_text.= ' FcgidIdleTimeout ' . $this->settings['system']['mod_fcgid_idle_timeout'] . "\n";
if((int)$this->settings['system']['mod_fcgid_wrapper'] == 0)
$php_options_text.= ' FcgidIdleTimeout ' . Settings::Get('system.mod_fcgid_idle_timeout') . "\n";
if((int)Settings::Get('system.mod_fcgid_wrapper') == 0)
{
$php_options_text.= ' SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
$php_options_text.= ' ScriptAlias /php/ ' . $php->getInterface()->getConfigDir() . "\n";
@@ -78,7 +78,7 @@ class apache_fcgid extends apache
$php_options_text.= ' Options +ExecCGI' . "\n";
$php_options_text.= ' </FilesMatch>' . "\n";
// >=apache-2.4 enabled?
if ($this->settings['system']['apache24'] == '1') {
if (Settings::Get('system.apache24') == '1') {
$php_options_text.= ' Require all granted' . "\n";
} else {
$php_options_text.= ' Order allow,deny' . "\n";
@@ -105,33 +105,33 @@ class apache_fcgid extends apache
public function createOwnVhostStarter()
{
if ($this->settings['system']['mod_fcgid_ownvhost'] == '1'
|| ($this->settings['phpfpm']['enabled'] == '1'
&& $this->settings['phpfpm']['enabled_ownvhost'] == '1')
if (Settings::Get('system.mod_fcgid_ownvhost') == '1'
|| (Settings::Get('phpfpm.enabled') == '1'
&& Settings::Get('phpfpm.enabled_ownvhost') == '1')
) {
$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown
if ($this->settings['system']['mod_fcgid_ownvhost'] == '1')
if (Settings::Get('system.mod_fcgid_ownvhost') == '1')
{
$user = $this->settings['system']['mod_fcgid_httpuser'];
$group = $this->settings['system']['mod_fcgid_httpgroup'];
$user = Settings::Get('system.mod_fcgid_httpuser');
$group = Settings::Get('system.mod_fcgid_httpgroup');
}
elseif($this->settings['phpfpm']['enabled'] == '1'
&& $this->settings['phpfpm']['enabled_ownvhost'] == '1'
elseif(Settings::Get('phpfpm.enabled') == '1'
&& Settings::Get('phpfpm.enabled_ownvhost') == '1'
) {
$user = $this->settings['phpfpm']['vhost_httpuser'];
$group = $this->settings['phpfpm']['vhost_httpgroup'];
$user = Settings::Get('phpfpm.vhost_httpuser');
$group = Settings::Get('phpfpm.vhost_httpgroup');
}
$domain = array(
'id' => 'none',
'domain' => $this->settings['system']['hostname'],
'domain' => Settings::Get('system.hostname'),
'adminid' => 1, /* first admin-user (superadmin) */
'mod_fcgid_starter' => -1,
'mod_fcgid_maxrequests' => -1,
'guid' => $user,
'openbasedir' => 0,
'email' => $this->settings['panel']['adminmail'],
'email' => Settings::Get('panel.adminmail'),
'loginname' => 'froxlor.panel',
'documentroot' => $mypath
);
@@ -144,12 +144,12 @@ class apache_fcgid extends apache
$php = new phpinterface($domain);
// get php-config
if ($this->settings['phpfpm']['enabled'] == '1') {
if (Settings::Get('phpfpm.enabled') == '1') {
// fpm
$phpconfig = $php->getPhpConfig($this->settings['phpfpm']['vhost_defaultini']);
$phpconfig = $php->getPhpConfig(Settings::Get('phpfpm.vhost_defaultini'));
} else {
// fcgid
$phpconfig = $php->getPhpConfig($this->settings['system']['mod_fcgid_defaultini_ownvhost']);
$phpconfig = $php->getPhpConfig(Settings::Get('system.mod_fcgid_defaultini_ownvhost'));
}
// create starter-file | config-file