Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 5cc368eca4d1b8f3768ad1fc42c45dac31dd17af..3de1e73b178580fb3dc3e6b3f32f514c5ae8a299 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');
 
+       // 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
-       @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-'.CONST_Postgis_Version);
        @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
@@ -37,6 +40,7 @@
        }
 
        // Website settings
+       @define('CONST_NoAccessControl', true);
        @define('CONST_BlockedIPs', '');
        @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
        @define('CONST_WhitelistedIPs', '');
@@ -58,6 +62,7 @@
        @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);