reorganise table creation

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 26b48551d7eadae021c2ceb91f5d1fbec6d05472..1b5422f9d641699b48ff0524e0c93d8283f2191a 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -4,11 +4,13 @@
 
        // General settings
        @define('CONST_Debug', false);
 
        // General settings
        @define('CONST_Debug', false);

-       @define('CONST_Database_DSN', 'pgsql://@/nominatim');
+       @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_Max_Word_Frequency', '50000');

+       @define('CONST_Limit_Reindexing', true);

 
        // Software versions
 
        // Software versions

-       @define('CONST_Postgresql_Version', '9.1'); // values: 8.3, 8.4, 9.0, 9.1, 9.2
+       @define('CONST_Postgresql_Version', '9.1'); // values: 9.0, 9.1, 9.2

        @define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
 
        // Paths
        @define('CONST_Postgis_Version', '1.5'); // values: 1.5, 2.0
 
        // Paths


@@ -17,6 +19,32 @@
        @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');
 

+       // 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 - 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');
+       @define('CONST_Replication_Update_Interval', '60');  // How often upstream publishes diffs
+       @define('CONST_Replication_Recheck_Interval', '60'); // How long to sleep if no update found yet
+

        // Connection buckets to rate limit people being nasty
        @define('CONST_ConnectionBucket_MemcacheServerAddress', false);
        @define('CONST_ConnectionBucket_MemcacheServerPort', 11211);
        // Connection buckets to rate limit people being nasty
        @define('CONST_ConnectionBucket_MemcacheServerAddress', false);
        @define('CONST_ConnectionBucket_MemcacheServerPort', 11211);


@@ -28,6 +56,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


@@ -45,11 +74,12 @@
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_BulkUserIPs', '');
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_BulkUserIPs', '');

+       @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs

 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
 
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
 

-       @define('CONST_Default_Language', 'xx');
+       @define('CONST_Default_Language', false);

        @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);


@@ -57,7 +87,7 @@
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 
        @define('CONST_Search_AreaPolygons_Enabled', true);
        @define('CONST_Search_AreaPolygons', true);
 

-       @define('CONST_Suggestions_Enabled', false);
+       @define('CONST_Search_BatchMode', false);

 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
 
        @define('CONST_Search_TryDroppedAddressTerms', false);
        @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);