Merge branch 'master' of http://github.com/twain47/Nominatim

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 8f966e5e3b8b1221288b6a02dfee59f7c4e0cf7b..ce4bec5a0aa52549c2449bc6217e5cc59c54db8b 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,25 +5,33 @@
        // General settings
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
+       @define('CONST_Max_Word_Frequency', '50000');
 
        // Paths
-       @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/9.0/contrib');
+       @define('CONST_Postgresql_Version', '9.1');
+       @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', '/usr/bin/osmosis');
 
        // Website settings
-       @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_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);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
+       @define('CONST_Search_AreaPolygons', true);
 
        @define('CONST_Suggestions_Enabled', false);
 
@@ -31,3 +39,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', '');