get rid of absolute paths

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index edbe26048cc61439634e0353764402b68c8acc31..f6aa5730e1926eeba28867ea144b28bb4a7f17f4 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,18 +7,19 @@
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // Paths
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
 
        // 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_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_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+       @define('CONST_Osmosis_Binary', CONST_BasePath.'/../osmosis-0.40.1/bin/osmosis');

 
        // Website settings
 
        // Website settings

-       @define('CONST_ClosedForIndexing', false);
-       @define('CONST_ClosedForIndexingExceptionIPs', '');

        @define('CONST_BlockedIPs', '');
        @define('CONST_BlockedIPs', '');

+       @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
+       @define('CONST_WhitelistedIPs', '');

        @define('CONST_BlockedUserAgents', '');
        @define('CONST_BlockReverseMaxLoad', 15);
        @define('CONST_BlockedUserAgents', '');
        @define('CONST_BlockReverseMaxLoad', 15);

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

 
        @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');


@@ -29,6 +30,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);