From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 14 Jan 2013 22:59:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~651
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3b960a5bf343f5617326f162c6df3399dce34930?ds=sidebyside

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
---

3b960a5bf343f5617326f162c6df3399dce34930
diff --cc utils/setup.php
index 45b40fed,473d0cb0..6bd21055
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -154,9 -154,9 +154,10 @@@
  			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
  			fail("osm2pgsql not found in '$osm2pgsql'");
  		}
 +		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
  		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 16000';
+ 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);