Merge branch 'mountain_pass' of https://github.com/datendelphin/Nominatim

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 8f966e5e3b8b1221288b6a02dfee59f7c4e0cf7b..30739f433a4163d01960b6f567ef031ca6614824 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,8 +7,11 @@
        @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_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+       @define('CONST_Osmosis_Binary', CONST_BasePath.'/osmosis-0.38/bin/osmosis');
 
        // Website settings
        @define('CONST_ClosedForIndexing', false);
@@ -24,6 +27,7 @@
        @define('CONST_Default_Zoom', 2);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
+       @define('CONST_Search_AreaPolygons', true);
 
        @define('CONST_Suggestions_Enabled', false);
 
@@ -31,3 +35,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', '');