update osm2pgsql (conscription number patch)

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 6f6f843b929e830217e8e5b203121d0093c3ea9f..771cf80fa6e5f723f340a29f0c3ce2b1df335845 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -4,7 +4,7 @@
 
        // 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_Max_Word_Frequency', '50000');
 
        // Software versions
@@ -13,10 +13,16 @@
 
        // Paths
        @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');
 
+       // 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);
@@ -28,6 +34,7 @@
        @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