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 df9652117b911ca11d881c579a744716d172c95f..ce4bec5a0aa52549c2449bc6217e5cc59c54db8b 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,13 +5,14 @@
        // General settings
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
        // General settings
        @define('CONST_Debug', false);
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');

+       @define('CONST_Max_Word_Frequency', '50000');

 
        // Paths
 
        // Paths

-       @define('CONST_Postgresql_Version', '9.0');
+       @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_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', CONST_BasePath.'/../osmosis-0.40.1/bin/osmosis');
+       @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');

 
        // Website settings
        @define('CONST_BlockedIPs', '');
 
        // Website settings
        @define('CONST_BlockedIPs', '');