Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index a04795efa30035455d9ab65fda19f87492a3fdbc..598ce86e7fe823d9f83c51434ba97df510d5e24d 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -70,13 +70,15 @@
 
        // 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_BlockMessage', ''); // additional info to show for blocked IPs
 
        @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', false);
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', false);