adapt settings for poldi

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 3493a34af40be61f9676d39cc58af4e97448a434..edbe26048cc61439634e0353764402b68c8acc31 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,21 +7,23 @@
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // Paths
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // Paths

-       @define('CONST_Postgresql_Version', '9.1');
+       @define('CONST_Postgresql_Version', '9.0');

        @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_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');
+    @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/../osm2pgsql/osm2pgsql');
+    @define('CONST_Osmosis_Binary', CONST_BasePath.'/../osmosis-0.40.1/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_BlockedUserAgents', '');
+       @define('CONST_BlockReverseMaxLoad', 15);

 
 

-       @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
+       @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');

        @define('CONST_Tile_Default', 'Mapnik');
 
        @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_Default_Lat', 20.0);
        @define('CONST_Default_Lon', 0.0);
        @define('CONST_Default_Zoom', 2);


@@ -34,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', '');