X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/db3ced17bbfff00411f506d8c84419c875959d5e..a3ce89aeff1f15b4bacb029828759c47ff9fb518:/lib-php/lib.php diff --git a/lib-php/lib.php b/lib-php/lib.php index a02fefd0..6798e749 100644 --- a/lib-php/lib.php +++ b/lib-php/lib.php @@ -7,7 +7,8 @@ function loadSettings($sProjectDir) // the installed scripts. Neither setting is part of the official // set of settings. defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']); - defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']); + defined('CONST_SqlDir') or define('CONST_SqlDir', $_SERVER['NOMINATIM_SQLDIR']); + defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']); defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']); } @@ -36,7 +37,7 @@ function getSettingConfig($sConfName, $sSystemConfig) $sValue = $_SERVER['NOMINATIM_'.$sConfName]; if (!$sValue) { - return CONST_DataDir.'/settings/'.$sSystemConfig; + return CONST_ConfigDir.'/'.$sSystemConfig; } return $sValue;