osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-26 13:27:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

changed nominatim.so module path to be a runtime configuration setting as opposed to a command line argument

Browse Source
This commit is contained in:
Eric Stadtherr 2018-07-24 15:25:12 -06:00
parent 057d77fcd4
commit 87d78e87d2
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
settings/defaults.php
View File

@ -9,6 +9,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
@define('CONST_Debug', false); @define('CONST_Debug', false);
@define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database> @define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
@define('CONST_Database_Web_User', 'www-data'); @define('CONST_Database_Web_User', 'www-data');
@define('CONST_Database_Module_Path', CONST_InstallPath.'/module');
@define('CONST_Max_Word_Frequency', '50000'); @define('CONST_Max_Word_Frequency', '50000');
@define('CONST_Limit_Reindexing', true); @define('CONST_Limit_Reindexing', true);
// Restrict search languages. // Restrict search languages.

8
utils/setup.php
View File

@ -16,7 +16,6 @@ $aCMDOptions
array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'), array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),
array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'), array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),
array('module-path', '', 0, 1, 1, 1, 'string', 'Directory on Postgres server containing Nominatim module'),
array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'), array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),
@ -80,11 +79,8 @@ if (isset($aCMDResult['osm2pgsql-cache'])) {
$iCacheMemory = getCacheMemoryMB(); $iCacheMemory = getCacheMemoryMB();
} }
$sModulePath = CONST_InstallPath . '/module'; $sModulePath = CONST_Database_Module_Path;
if (isset($aCMDResult['module-path'])) { info('module path: ' . $sModulePath);
$sModulePath = $aCMDResult['module-path'];
echo 'module path: ' . $sModulePath . '\n';
}
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;