From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 8 Oct 2012 05:43:37 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/twain47/Nominatim
X-Git-Tag: deploy~673
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/03d6c48ef1bbc4ccd057125db6df015c0f8e53f0

Merge branch 'master' of http://github.com/twain47/Nominatim

Conflicts:
	settings/settings.php
	utils/specialphrases.php
	website/search.php
---

03d6c48ef1bbc4ccd057125db6df015c0f8e53f0
diff --cc settings/settings.php
index f6aa5730,f441521f..ce4bec5a
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -11,20 -12,18 +12,20 @@@
  	@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_Osmosis_Binary', '/usr/bin/osmosis');
  
  	// Website settings
 -	@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_Website_BaseURL', 'http://'.php_uname('n').'/');
 +	@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
  	@define('CONST_Tile_Default', 'Mapnik');
  
 -	@define('CONST_Default_Language', 'xx');
 +	@define('CONST_Default_Language', 'en');
  	@define('CONST_Default_Lat', 20.0);
  	@define('CONST_Default_Lon', 0.0);
  	@define('CONST_Default_Zoom', 2);