From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 27 Feb 2015 19:02:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~479
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1f951e863a870854188603b29c8a98e3897dccdd?ds=inline;hp=-c

Merge remote-tracking branch 'upstream/master'
---

1f951e863a870854188603b29c8a98e3897dccdd
diff --combined settings/settings.php
index 3da42133,a04795ef..598ce86e
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -70,15 -70,13 +70,15 @@@
  
  	// Website settings
  	@define('CONST_NoAccessControl', true);
 -	@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_BlockMessage', ''); // additional info to show for blocked IPs
  
 -	@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', false);
@@@ -92,7 -90,7 +92,7 @@@
  	@define('CONST_Search_BatchMode', false);
  
  	@define('CONST_Search_TryDroppedAddressTerms', false);
- 	@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
+ 	@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
  
  	// Set to zero to disable polygon output
  	@define('CONST_PolygonOutput_MaximumTypes', 1);