switch to distribution-supplied osmosis

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 9f1d49087968175cf6ca30bad8826e48d7ecaa90..d90136bdbf41a8e1ec4183a5515312a11eb9247e 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,15 +7,20 @@
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // Paths
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // 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_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', '');
 
        // Website settings
        @define('CONST_ClosedForIndexing', false);
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');

+       @define('CONST_BulkUserIPs', '');

 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');

+       @define('CONST_Tile_Default', 'Mapnik');

 
        @define('CONST_Default_Language', 'xx');
        @define('CONST_Default_Lat', 20.0);
 
        @define('CONST_Default_Language', 'xx');
        @define('CONST_Default_Lat', 20.0);


@@ -23,6 +28,7 @@
        @define('CONST_Default_Zoom', 2);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Default_Zoom', 2);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);

+       @define('CONST_Search_AreaPolygons', true);

 
        @define('CONST_Suggestions_Enabled', false);
 
 
        @define('CONST_Suggestions_Enabled', false);
 


@@ -30,3 +36,5 @@
        @define('CONST_Log_DB', true);
        @define('CONST_Log_File', false);
        @define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
        @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', '');