Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index cd97b4a76fd7c9feda9ba19278df5c7880b394d6..915952727ccc098fa3ba83295def733efbc39ac4 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -7,10 +7,13 @@
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
        @define('CONST_Max_Word_Frequency', '50000');
 
        @define('CONST_Database_DSN', 'pgsql://@/nominatim');
        @define('CONST_Max_Word_Frequency', '50000');
 

+       // Software versions
+       @define('CONST_Postgresql_Version', '9.1'); // values: 8.3, 8.4, 9.0, 9.1, 9.2
+       @define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
+

        // Paths
        // Paths

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

        @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
        @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-'.CONST_Postgis_Version);

        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 


@@ -25,6 +28,7 @@
        @define('CONST_ConnectionBucket_Cost_Reverse', 1);
        @define('CONST_ConnectionBucket_Cost_Search', 2);
        @define('CONST_ConnectionBucket_Cost_Details', 3);
        @define('CONST_ConnectionBucket_Cost_Reverse', 1);
        @define('CONST_ConnectionBucket_Cost_Search', 2);
        @define('CONST_ConnectionBucket_Cost_Details', 3);

+       @define('CONST_ConnectionBucket_Cost_Status', 1);

 
        // Override this function to add an adjustment factor to the cost
        // based on server load. e.g. getBlockingProcesses
 
        // Override this function to add an adjustment factor to the cost
        // based on server load. e.g. getBlockingProcesses


@@ -38,12 +42,14 @@
 
        // Website settings
        @define('CONST_NoAccessControl', true);
 
        // Website settings
        @define('CONST_NoAccessControl', true);

-       @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_BulkUserIPs', '');
 
        @define('CONST_BulkUserIPs', '');
 

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

        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', 'xx');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', 'xx');


@@ -57,6 +63,7 @@
        @define('CONST_Suggestions_Enabled', false);
 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Suggestions_Enabled', false);
 
        @define('CONST_Search_TryDroppedAddressTerms', false);

+       @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);

 
        // Set to zero to disable polygon output
        @define('CONST_PolygonOutput_MaximumTypes', 1);
 
        // Set to zero to disable polygon output
        @define('CONST_PolygonOutput_MaximumTypes', 1);