X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a6453a808db7dccd687a3fceeedff88b0fd2e06c..41cab5b08613c45fa3b888c7af46ce72fc58b515:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index ca90b3c5..f6aa5730 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,5 +1,4 @@
 <?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);
 
@@ -8,21 +7,36 @@
 	@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_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
+	@define('CONST_WhitelistedIPs', '');
+	@define('CONST_BlockedUserAgents', '');
+	@define('CONST_BlockReverseMaxLoad', 15);
+	@define('CONST_BulkUserIPs', '');
 
-	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
+	@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
+	@define('CONST_Tile_Default', 'Mapnik');
 
-	@define('CONST_Default_Language', 'xx');
+	@define('CONST_Default_Language', 'en');
 	@define('CONST_Default_Lat', 20.0);
 	@define('CONST_Default_Lon', 0.0);
 	@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', '');