X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cc564e2f319bb267884998c7243d179320aa0327..fcd3a42bf73242661910cb9b2f1d17b5f6ac5332:/settings/settings.php?ds=inline

diff --git a/settings/settings.php b/settings/settings.php
index 3493a34a..edbe2604 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,21 +7,23 @@
 	@define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
 	// Paths
-	@define('CONST_Postgresql_Version', '9.1');
+	@define('CONST_Postgresql_Version', '9.0');
 	@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.38/bin/osmosis');
+    @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/../osm2pgsql/osm2pgsql');
+    @define('CONST_Osmosis_Binary', CONST_BasePath.'/../osmosis-0.40.1/bin/osmosis');
 
 	// Website settings
 	@define('CONST_ClosedForIndexing', false);
 	@define('CONST_ClosedForIndexingExceptionIPs', '');
 	@define('CONST_BlockedIPs', '');
+	@define('CONST_BlockedUserAgents', '');
+	@define('CONST_BlockReverseMaxLoad', 15);
 
-	@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);
@@ -34,3 +36,5 @@
 	@define('CONST_Log_DB', true);
 	@define('CONST_Log_File', false);
 	@define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
+	@define('CONST_Log_File_SearchLog', '');
+	@define('CONST_Log_File_ReverseLog', '');