hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce constant for configuration directory

Browse Source 
This replaces {data_dir}/settings throughout the code, so that
the configuration may be placed somewhere else in the directory
structure (e.g. in /etc).
This commit is contained in:
Sarah Hoffmann
2021-02-09 18:45:45 +01:00
parent b9517c99ae
commit 298ed11261
8 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/dotenv_loader.php
View File

@@ -5,7 +5,7 @@ require('Symfony/Component/Dotenv/autoload.php');
function loadDotEnv()
{
$dotenv = new \Symfony\Component\Dotenv\Dotenv();
$dotenv->load(CONST_DataDir.'/settings/env.defaults');
$dotenv->load(CONST_ConfigDir.'/env.defaults');
if (file_exists('.env')) {
$dotenv->load('.env');

3
lib-php/lib.php
View File

@@ -9,6 +9,7 @@ function loadSettings($sProjectDir)
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']);
}
@@ -37,7 +38,7 @@ function getSettingConfig($sConfName, $sSystemConfig)
$sValue = $_SERVER['NOMINATIM_'.$sConfName];
if (!$sValue) {
return CONST_DataDir.'/settings/'.$sSystemConfig;
return CONST_ConfigDir.'/'.$sSystemConfig;
}
return $sValue;

2
lib-php/setup_functions.php
View File

@@ -27,7 +27,7 @@ function getImportStyle()
$sStyle = getSetting('IMPORT_STYLE');
if (in_array($sStyle, array('admin', 'street', 'address', 'full', 'extratags'))) {
return CONST_DataDir.'/settings/import-'.$sStyle.'.style';
return CONST_ConfigDir.'/import-'.$sStyle.'.style';
}
return $sStyle;