From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 21 Oct 2013 16:30:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~568
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/2db6f931b6ce1d331433f7e4f02ac332381a7b29

Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/init-website.php
---

2db6f931b6ce1d331433f7e4f02ac332381a7b29
diff --cc settings/settings.php
index f31e16b6,27b3446b..52776aeb
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -51,14 -51,13 +51,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);