X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e6d983474bc4f1720b2ef4460041b423b02fc172..1298d144e015aae98766ea708df031cefc282a8a:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index f8075cb1..4ebc199d 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,19 +1,26 @@
 <?php
+	if (file_exists(CONST_BasePath.'/settings/local.php')) require_once(CONST_BasePath.'/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');
 
 	// Paths
-	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/9.0/contrib');
+	@define('CONST_Postgresql_Version', '9.1');
+	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
 	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-1.5');
+	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+	@define('CONST_Osmosis_Binary', CONST_BasePath.'/osmosis-0.40.1/bin/osmosis');
 
 	// Website settings
 	@define('CONST_ClosedForIndexing', false);
 	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@define('CONST_BlockedIPs', '');
+	@define('CONST_BulkUserIPs', '');
 
 	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
+	@define('CONST_Tile_Default', 'Mapnik');
 
 	@define('CONST_Default_Language', 'xx');
 	@define('CONST_Default_Lat', 20.0);
@@ -21,7 +28,13 @@
 	@define('CONST_Default_Zoom', 2);
 
 	@define('CONST_Search_AreaPolygons_Enabled', true);
+	@define('CONST_Search_AreaPolygons', true);
 
 	@define('CONST_Suggestions_Enabled', false);
 
-
+	// Log settings
+	@define('CONST_Log_DB', true);
+	@define('CONST_Log_File', false);
+	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
+	@define('CONST_Log_File_SearchLog', '');
+	@define('CONST_Log_File_ReverseLog', '');