Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index dbd9bf930cc801ccd45287001d4696dcb27ae98e..f31e16b6ab276ed4738e382c29b3b830551f57ba 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -17,7 +17,7 @@
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 

-    // osm2pgsql settings
+       // osm2pgsql settings

        @define('CONST_Osm2pgsql_Flatnode_File', null);
 
        // Replication settings
        @define('CONST_Osm2pgsql_Flatnode_File', null);
 
        // Replication settings


@@ -51,12 +51,14 @@
 
        // Website settings
        @define('CONST_NoAccessControl', true);
 
        // Website settings
        @define('CONST_NoAccessControl', true);

-       @define('CONST_ClosedForIndexing', false);
-       @define('CONST_ClosedForIndexingExceptionIPs', '');

        @define('CONST_BlockedIPs', '');
        @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_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', false);
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', false);


@@ -67,6 +69,8 @@
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 

+       @define('CONST_Search_BatchMode', false);
+

        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);