Merge branch 'master' of http://github.com/twain47/Nominatim

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 1db725c466f23b8c826069d2a662cc021ea9d5a6..8e3d1cb5fc108c49cd59f2363c49a3bc5c2a23ef 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -146,8 +146,9 @@
                        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 .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
 
@@ -340,6 +341,7 @@
                        echo '.';
                }
                echo "\n";
+               pgsqlRunScript('ALTER TABLE place SET TABLESPACE "data"');
                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }