Chapril/paste.chapril.org-privatebin
Chapril/paste.chapril.org-privatebin
24
0
Fork 0
Code Issues Releases Wiki Activity

Add support for a CONFIG_PATH variable

Browse Source
This commit is contained in:
Lucas Savva 2019-12-19 09:49:59 +00:00
parent 825f6884be
commit 6b0468ebff
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Configuration.php
View File

@ -102,8 +102,14 @@ class Configuration
public function __construct()
{
$config = array();
$configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.php';
$configIni = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
$basePath = PATH. 'cfg' . DIRECTORY_SEPARATOR;
$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
if (is_readable($configIni)) {
@ -112,7 +118,7 @@ class Configuration
// cleanup sample, too
$configIniSample = $configIni . '.sample';
if (is_readable($configIniSample)) {
DataStore::prependRename($configIniSample, PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.sample.php', ';');
DataStore::prependRename($configIniSample, $basePath . 'conf.sample.php', ';');
}
}