X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7cb27dc881b27602330dd829e4bd0d2130b6b5b1..1ccf4fb92fe71e9e2bc0baabfb2e92cd79166dae:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index dd424e07..52776aeb 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -16,10 +16,15 @@
 	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
 	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
 	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
-	//@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
-	//@define('CONST_Replication_MaxInterval', '3600');
-	@define('CONST_Replication_Url', 'http://download.geofabrik.de/europe/ireland-and-northern-ireland-updates');
-	@define('CONST_Replication_MaxInterval', '259200');
+
+	// osm2pgsql settings
+	@define('CONST_Osm2pgsql_Flatnode_File', null);
+
+	// Replication settings
+	@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
+	@define('CONST_Replication_MaxInterval', '3600');
+	@define('CONST_Replication_Update_Interval', '60');  // How often upstream publishes diffs
+	@define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet
 
 	// Connection buckets to rate limit people being nasty
 	@define('CONST_ConnectionBucket_MemcacheServerAddress', false);
@@ -46,15 +51,18 @@
 
 	// 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', 'xx');
+	@define('CONST_Default_Language', false);
 	@define('CONST_Default_Lat', 20.0);
 	@define('CONST_Default_Lon', 0.0);
 	@define('CONST_Default_Zoom', 2);
@@ -62,7 +70,7 @@
 	@define('CONST_Search_AreaPolygons_Enabled', true);
 	@define('CONST_Search_AreaPolygons', true);
 
-	@define('CONST_Suggestions_Enabled', false);
+	@define('CONST_Search_BatchMode', false);
 
 	@define('CONST_Search_TryDroppedAddressTerms', false);
 	@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);