X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/26e30bf8e18f6c7a30cc056972d1399994309270..a4ecd9d73e93a56aeee336c7fa7e18aa42bd9e03:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index a054eb25..d48aff73 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,10 +1,12 @@
 <?php
-	if (file_exists(CONST_BasePath.'/settings/local.php')) require_once(CONST_BasePath.'/settings/local.php');
+	@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
+	@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
+	if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
 	if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
 	// General settings
 	@define('CONST_Debug', false);
-	@define('CONST_Database_DSN', 'pgsql://@/nominatim_lines'); // <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_Max_Word_Frequency', '50000');
 	@define('CONST_Limit_Reindexing', true);
@@ -23,7 +25,7 @@
 	// Paths
 	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
 	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
-	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+	@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 	@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
 
@@ -84,7 +86,7 @@
 	@define('CONST_BulkUserIPs', '');
 	@define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
 
-	@define('CONST_Website_BaseURL', 'http://localhost/nominatim/');
+	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 	@define('CONST_Tile_Default', 'Mapnik');
 
 	@define('CONST_Default_Language', false);