X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7c6a88295f8d33688c5a178fd5e6b317b000d91f..921cc233890705d6a916fa415b51fdd88fa8fe11:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index edbe2604..91595272 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,33 +5,69 @@
 	// General settings
 	@define('CONST_Debug', false);
 	@define('CONST_Database_DSN', 'pgsql://@/nominatim');
+	@define('CONST_Max_Word_Frequency', '50000');
+
+	// Software versions
+	@define('CONST_Postgresql_Version', '9.1'); // values: 8.3, 8.4, 9.0, 9.1, 9.2
+	@define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
 
 	// Paths
-	@define('CONST_Postgresql_Version', '9.0');
 	@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');
+	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
+	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
+
+	// Connection buckets to rate limit people being nasty
+	@define('CONST_ConnectionBucket_MemcacheServerAddress', false);
+	@define('CONST_ConnectionBucket_MemcacheServerPort', 11211);
+	@define('CONST_ConnectionBucket_MaxBlockList', 100);
+	@define('CONST_ConnectionBucket_LeakRate', 1);
+	@define('CONST_ConnectionBucket_BlockLimit', 10);
+	@define('CONST_ConnectionBucket_WaitLimit', 6);
+	@define('CONST_ConnectionBucket_MaxSleeping', 10);
+	@define('CONST_ConnectionBucket_Cost_Reverse', 1);
+	@define('CONST_ConnectionBucket_Cost_Search', 2);
+	@define('CONST_ConnectionBucket_Cost_Details', 3);
+	@define('CONST_ConnectionBucket_Cost_Status', 1);
+
+	// Override this function to add an adjustment factor to the cost
+	// based on server load. e.g. getBlockingProcesses
+	if (!function_exists('user_busy_cost'))
+	{
+		function user_busy_cost()
+		{
+			return 0;
+		}
+	}
 
 	// Website settings
-	@define('CONST_ClosedForIndexing', false);
-	@define('CONST_ClosedForIndexingExceptionIPs', '');
+	@define('CONST_NoAccessControl', true);
 	@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://nominatim.openstreetmap.org/');
 	@define('CONST_Tile_Default', 'Mapnik');
 
-	@define('CONST_Default_Language', 'en');
+	@define('CONST_Default_Language', 'xx');
 	@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);
 
+	@define('CONST_Search_TryDroppedAddressTerms', false);
+	@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
+
+	// Set to zero to disable polygon output
+	@define('CONST_PolygonOutput_MaximumTypes', 1);
+
 	// Log settings
 	@define('CONST_Log_DB', true);
 	@define('CONST_Log_File', false);