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

- restore still used settings in 120.system.php

Browse Source 
- check for $createifnotexists in phpinterface_* classes
This commit is contained in:
Michael Kaufmann (d00p)
2010-12-07 11:08:41 +00:00
parent 9c075c05f5
commit 59bf7ba22f
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
actions/admin/settings/120.system.php
View File

@@ -29,6 +29,7 @@ return array(
'type' => 'string', 'type' => 'string',
'default' => '/var/customers/webs/', 'default' => '/var/customers/webs/',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'plausibility_check_method' => 'checkPathConflicts'
), ),
'system_ipaddress' => array( 'system_ipaddress' => array(
'label' => $lng['serversettings']['ipaddress'], 'label' => $lng['serversettings']['ipaddress'],
@@ -58,6 +59,22 @@ return array(
'default' => '', 'default' => '',
'save_method' => 'storeSettingHostname', 'save_method' => 'storeSettingHostname',
), ),
'system_froxlordirectlyviahostname' => array(
'label' => $lng['serversettings']['froxlordirectlyviahostname'],
'settinggroup' => 'system',
'varname' => 'froxlordirectlyviahostname',
'type' => 'bool',
'default' => false,
'save_method' => 'storeSettingField',
),
'system_stdsubdomain' => array(
'label' => $lng['serversettings']['stdsubdomainhost'],
'settinggroup' => 'system',
'varname' => 'stdsubdomain',
'type' => 'string',
'default' => '',
'save_method' => 'storeSettingHostname',
),
'system_mysql_access_host' => array( 'system_mysql_access_host' => array(
'label' => $lng['serversettings']['mysql_access_host'], 'label' => $lng['serversettings']['mysql_access_host'],
'settinggroup' => 'system', 'settinggroup' => 'system',

4
lib/classes/phpinterface/class.phpinterface_fcgid.php
View File

@@ -215,7 +215,7 @@ class phpinterface_fcgid
{ {
$configdir = makeCorrectDir($this->_settings['system']['mod_fcgid_configdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/'); $configdir = makeCorrectDir($this->_settings['system']['mod_fcgid_configdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
if(!is_dir($configdir)) if(!is_dir($configdir) && $createifnotexists)
{ {
safe_exec('mkdir -p ' . escapeshellarg($configdir)); safe_exec('mkdir -p ' . escapeshellarg($configdir));
safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($configdir)); safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($configdir));
@@ -235,7 +235,7 @@ class phpinterface_fcgid
{ {
$tmpdir = makeCorrectDir($this->_settings['system']['mod_fcgid_tmpdir'] . '/' . $this->_domain['loginname'] . '/'); $tmpdir = makeCorrectDir($this->_settings['system']['mod_fcgid_tmpdir'] . '/' . $this->_domain['loginname'] . '/');
if(!is_dir($tmpdir)) if(!is_dir($tmpdir) && $createifnotexists)
{ {
safe_exec('mkdir -p ' . escapeshellarg($tmpdir)); safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
safe_exec('chown -R ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($tmpdir)); safe_exec('chown -R ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($tmpdir));

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

@@ -139,7 +139,7 @@ class phpinterface_fpm
$configdir = makeCorrectDir($this->_settings['phpfpm']['configdir']); $configdir = makeCorrectDir($this->_settings['phpfpm']['configdir']);
$config = makeCorrectFile($configdir.'/'.$this->_domain['domain'].'.conf'); $config = makeCorrectFile($configdir.'/'.$this->_domain['domain'].'.conf');
if(!is_dir($configdir)) if(!is_dir($configdir) && $createifnotexists)
{ {
safe_exec('mkdir -p ' . escapeshellarg($configdir)); safe_exec('mkdir -p ' . escapeshellarg($configdir));
} }
@@ -150,14 +150,16 @@ class phpinterface_fpm
/** /**
* return path of fpm-socket file * return path of fpm-socket file
* *
* @param boolean $createifnotexists create the directory if it does not exist
*
* @return string the full path to the socket * @return string the full path to the socket
*/ */
public function getSocketFile() public function getSocketFile($createifnotexists = true)
{ {
$socketdir = makeCorrectDir('/var/run/'.$this->_settings['system']['webserver'].'/'); $socketdir = makeCorrectDir('/var/run/'.$this->_settings['system']['webserver'].'/');
$socket = makeCorrectFile($socketdir.'/'.$this->_domain['loginname'].'-'.$this->_domain['domain'].'-php-fpm.socket'); $socket = makeCorrectFile($socketdir.'/'.$this->_domain['loginname'].'-'.$this->_domain['domain'].'-php-fpm.socket');
if(!is_dir($socketdir)) if(!is_dir($socketdir) && $createifnotexists)
{ {
safe_exec('mkdir -p '.$socketdir); safe_exec('mkdir -p '.$socketdir);
safe_exec('chown -R '.$this->_settings['system']['httpuser'].':'.$this->_settings['system']['httpgroup'].' '.$socketdir); safe_exec('chown -R '.$this->_settings['system']['httpuser'].':'.$this->_settings['system']['httpgroup'].' '.$socketdir);