X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e03ae6d7ebdf56d084b00091382f5bcf0cb7e486..96d3cb61c80d5fd0219497f74f908ca867ba5dce:/settings/settings.php?ds=sidebyside

diff --git a/settings/settings.php b/settings/settings.php
index 65604035..afa20d20 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,8 +7,11 @@
 	@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.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');
@@ -17,13 +20,17 @@
 	// 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);
 
+	// 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()
@@ -33,6 +40,7 @@
 	}
 
 	// Website settings
+	@define('CONST_NoAccessControl', true);
 	@define('CONST_ClosedForIndexing', false);
 	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@define('CONST_BlockedIPs', '');