Add support for a CONFIG_PATH variable
This commit is contained in:
parent
825f6884be
commit
6b0468ebff
|
@ -102,8 +102,14 @@ class Configuration
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$config = array();
|
$config = array();
|
||||||
$configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.php';
|
$basePath = PATH. 'cfg' . DIRECTORY_SEPARATOR;
|
||||||
$configIni = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
|
$configIni = $basePath . 'conf.ini';
|
||||||
|
|
||||||
|
if (getenv('CONFIG_PATH') !== false) {
|
||||||
|
$configFile = getenv('CONFIG_PATH');
|
||||||
|
} else {
|
||||||
|
$configFile = $basePath . 'conf.php';
|
||||||
|
}
|
||||||
|
|
||||||
// rename INI files to avoid configuration leakage
|
// rename INI files to avoid configuration leakage
|
||||||
if (is_readable($configIni)) {
|
if (is_readable($configIni)) {
|
||||||
|
@ -112,7 +118,7 @@ class Configuration
|
||||||
// cleanup sample, too
|
// cleanup sample, too
|
||||||
$configIniSample = $configIni . '.sample';
|
$configIniSample = $configIni . '.sample';
|
||||||
if (is_readable($configIniSample)) {
|
if (is_readable($configIniSample)) {
|
||||||
DataStore::prependRename($configIniSample, PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.sample.php', ';');
|
DataStore::prependRename($configIniSample, $basePath . 'conf.sample.php', ';');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue