X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6b1f2cb2bc9771f2c65ff3f44855e6bfdf778d90..bee4fe5b4b497e37c77fc018fbca99f5e56b80cc:/settings/settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 11e450e9..694c8352 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,22 +5,41 @@
 	// General settings
 	@define('CONST_Debug', false);
 	@define('CONST_Database_DSN', 'pgsql://@/nominatim'); // <driver>://<username>:<password>@<host>:<port>/<database>
+	@define('CONST_Database_Web_User', 'www-data');
 	@define('CONST_Max_Word_Frequency', '50000');
 	@define('CONST_Limit_Reindexing', true);
 
 	// 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
+	@define('CONST_Postgresql_Version', '9.3'); // values: 9.0, ... , 9.4
+	@define('CONST_Postgis_Version', '2.1'); // values: 1.5, 2.0, 2.1
 
 	// Paths
 	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
 	@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_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
 
 	// osm2pgsql settings
 	@define('CONST_Osm2pgsql_Flatnode_File', null);
 
+	// tablespace settings
+	// osm2pgsql caching tables (aka slim mode tables) - update only
+	@define('CONST_Tablespace_Osm2pgsql_Data', false);
+	@define('CONST_Tablespace_Osm2pgsql_Index', false);
+	// osm2pgsql output tables (aka main table) - update only
+	@define('CONST_Tablespace_Place_Data', false);
+	@define('CONST_Tablespace_Place_Index', false);
+	// address computation tables - update only
+	@define('CONST_Tablespace_Address_Data', false);
+	@define('CONST_Tablespace_Address_Index', false);
+	// search tables - needed for lookups
+	@define('CONST_Tablespace_Search_Data', false);
+	@define('CONST_Tablespace_Search_Index', false);
+	// additional data, e.g. TIGER data, type searches - needed for lookups
+	@define('CONST_Tablespace_Aux_Data', false);
+	@define('CONST_Tablespace_Aux_Index', false);
+
 	// Replication settings
 	@define('CONST_Replication_Url', 'http://planet.openstreetmap.org/replication/minute');
 	@define('CONST_Replication_MaxInterval', '3600');
@@ -74,7 +93,7 @@
 	@define('CONST_Search_BatchMode', false);
 
 	@define('CONST_Search_TryDroppedAddressTerms', false);
-	@define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
+	@define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
 
 	// Set to zero to disable polygon output
 	@define('CONST_PolygonOutput_MaximumTypes', 1);