X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/a038582e34d73ac2575572c9dec0e890557fb0f5..03d6c48ef1bbc4ccd057125db6df015c0f8e53f0:/settings/settings.php?ds=sidebyside

diff --git a/settings/settings.php b/settings/settings.php
index edbe2604..ce4bec5a 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,20 +5,22 @@
 	// General settings
 	@define('CONST_Debug', false);
 	@define('CONST_Database_DSN', 'pgsql://@/nominatim');
+	@define('CONST_Max_Word_Frequency', '50000');
 
 	// Paths
-	@define('CONST_Postgresql_Version', '9.0');
+	@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');
-    @define('CONST_Osmosis_Binary', CONST_BasePath.'/../osmosis-0.40.1/bin/osmosis');
+	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+	@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://nominatim.openstreetmap.org/');
 	@define('CONST_Tile_Default', 'Mapnik');
@@ -29,6 +31,7 @@
 	@define('CONST_Default_Zoom', 2);
 
 	@define('CONST_Search_AreaPolygons_Enabled', true);
+	@define('CONST_Search_AreaPolygons', true);
 
 	@define('CONST_Suggestions_Enabled', false);