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

Setup: the conf dir is created by the setup program

Browse Source 
SVN:trunk[1768]
This commit is contained in:
Romain Quetiez
2012-01-13 10:49:43 +00:00
parent da4f475751
commit c7c69660bc
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/exclude.txt
View File

@@ -1,4 +0,0 @@
#
# The following source files are not re-distributed with the "build" of the application
# since they are used solely for constructing other files during the build process
#

21
setup/index.php
View File

@@ -588,6 +588,7 @@ function WelcomeAndCheckPrerequisites(SetupPage $oP, $aParamValues, $iCurrentSte
$sMode = 'install'; // Fresh install $sMode = 'install'; // Fresh install
$sConfigFile = utils::GetConfigFilePath(); $sConfigFile = utils::GetConfigFilePath();
$oP->log_info("Target configuration file: ".$sConfigFile);
// Check for a previous version // Check for a previous version
if (file_exists($sConfigFile)) if (file_exists($sConfigFile))
@@ -1370,6 +1371,14 @@ function SetupFinished(SetupPage $oP, $aParamValues, $iCurrentStep, Config $oCon
// Final config update: add the modules // Final config update: add the modules
UpdateConfigSettings($oConfig, $aParamValues, $aParamValues['target_dir']); UpdateConfigSettings($oConfig, $aParamValues, $aParamValues['target_dir']);
// Make sure the root configuration directory exists
if (!file_exists(APPCONF))
{
mkdir(APPCONF);
chmod(APPCONF, 0770); // RWX for owner and group, nothing for others
$oP->log_info("Created configuration directory: ".APPCONF);
}
// Write the final configuration file // Write the final configuration file
$sConfigFile = utils::GetConfigFilePath(); $sConfigFile = utils::GetConfigFilePath();
$sConfigDir = dirname($sConfigFile); $sConfigDir = dirname($sConfigFile);
@@ -1493,12 +1502,20 @@ else
{ {
// No configuration file yet // No configuration file yet
// Check that the wizard can write into the conf dir to create the configuration file // Check that the wizard can write into the conf dir to create the configuration file
if (!is_writable(APPCONF)) if (file_exists(APPCONF))
{
$sTestedDir = APPCONF;
}
else
{
$sTestedDir = APPROOT;
}
if (!is_writable($sTestedDir))
{ {
$oP->add("<h1>iTop configuration wizard</h1>\n"); $oP->add("<h1>iTop configuration wizard</h1>\n");
$oP->add("<h2>Fatal error</h2>\n"); $oP->add("<h2>Fatal error</h2>\n");
$oP->error("<b>Error:</b> the directory where to store the configuration file is not writable."); $oP->error("<b>Error:</b> the directory where to store the configuration file is not writable.");
$oP->p("The wizard cannot create the configuration file for you. Please make sure that the directory '<b>".realpath(APPCONF)."</b>' is writable for the web server."); $oP->p("The wizard cannot create the configuration file for you. Please make sure that the directory '<b>".realpath($sTestedDir)."</b>' is writable for the web server.");
$oP->output(); $oP->output();
exit; exit;
} }