composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°1092.1 Setup / MTP improvements regarding the environments folders:

Browse Source 
- /env-production-build rights check before running setup
- /env-xxx-build is no longer deleted after MTT / MTP from the ITSM Designer. This prevents permissions issue when webserver user doesn't have suffisant rights on the root folder.

SVN:trunk[5023]
This commit is contained in:
Guillaume Lajarige
2017-10-13 13:25:20 +00:00
parent 2f8062d296
commit 426a0933b1
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
setup/runtimeenv.class.inc.php
View File

@@ -947,7 +947,9 @@ class RunTimeEnvironment
);
$this->CommitDir(
APPROOT.'env-'.$this->sTargetEnv,
APPROOT.'env-'.$this->sFinalEnv
APPROOT.'env-'.$this->sFinalEnv,
true,
false
);
// Move the config file
@@ -1013,14 +1015,15 @@ class RunTimeEnvironment
*
* @param $sSource
* @param $sDest
* @param bool $bSourceMustExist
* @param boolean $bSourceMustExist
* @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
* @throws Exception
*/
protected function CommitDir($sSource, $sDest, $bSourceMustExist = true)
protected function CommitDir($sSource, $sDest, $bSourceMustExist = true, $bRemoveSource = true)
{
if (file_exists($sSource))
{
SetupUtils::movedir($sSource, $sDest);
SetupUtils::movedir($sSource, $sDest, $bRemoveSource);
}
else
{

28
setup/setuputils.class.inc.php
View File

@@ -82,7 +82,7 @@ class SetupUtils
}
// Check the common directories
$aWritableDirsErrors = self::CheckWritableDirs(array('log', 'env-production', 'conf', 'data'));
$aWritableDirsErrors = self::CheckWritableDirs(array('log', 'env-production', 'env-production-build', 'conf', 'data'));
$aResult = array_merge($aResult, $aWritableDirsErrors);
$aMandatoryExtensions = array('mysqli', 'iconv', 'simplexml', 'soap', 'hash', 'json', 'session', 'pcre', 'dom', 'phar', 'zlib', 'zip');
@@ -691,16 +691,17 @@ class SetupUtils
}
}
/**
* Helper to move a directory when the parent directory of the target dir cannot be written
* To be used as alternative to rename()
* Files/Subdirs of the source directory are moved one by one
* Returns void
* @param $sSource
* @param $sDest
* @throws Exception
*/
public static function movedir($sSource, $sDest)
/**
* Helper to move a directory when the parent directory of the target dir cannot be written
* To be used as alternative to rename()
* Files/Subdirs of the source directory are moved one by one
* Returns void
*
* @param string $sSource
* @param string $sDest
* @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
*/
public static function movedir($sSource, $sDest, $bRemoveSource = true)
{
if (!is_dir($sSource))
{
@@ -717,7 +718,10 @@ class SetupUtils
self::copydir($sSource, $sDest);
self::tidydir($sSource);
rmdir($sSource);
if($bRemoveSource === true)
{
rmdir($sSource);
}
/**
* We have tried the following implementation (based on a rename/mv)