Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 0ce34ad2e5601b7d972e9b68a0980ab63203f9b2..f31e16b6ab276ed4738e382c29b3b830551f57ba 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -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);