X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e03ae6d7ebdf56d084b00091382f5bcf0cb7e486..2df0cafb24fe32b3fbb9385c989da3bb6ad7b37c:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 65604035..f2cdf918 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -4,26 +4,40 @@
 
 	// General settings
 	@define('CONST_Debug', false);
-	@define('CONST_Database_DSN', 'pgsql://@/nominatim');
+	@define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
 	@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_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');
 
+	// Replication settings
+	@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
+	@define('CONST_Replication_MaxInterval', '3600');
+	@define('CONST_Replication_Update_Interval', '60');  // How often upstream publishes diffs
+	@define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet
+
 	// 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()
@@ -33,6 +47,7 @@
 	}
 
 	// Website settings
+	@define('CONST_NoAccessControl', true);
 	@define('CONST_ClosedForIndexing', false);
 	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@define('CONST_BlockedIPs', '');
@@ -41,7 +56,7 @@
 	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 	@define('CONST_Tile_Default', 'Mapnik');
 
-	@define('CONST_Default_Language', 'xx');
+	@define('CONST_Default_Language', false);
 	@define('CONST_Default_Lat', 20.0);
 	@define('CONST_Default_Lon', 0.0);
 	@define('CONST_Default_Zoom', 2);
@@ -52,6 +67,7 @@
 	@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);