Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/indices.src.sql
	sql/partition-tables.src.sql
	sql/tables.sql
	utils/setup.php

diff --cc settings/settings.php
Simple merge

diff --cc sql/functions.sql
Simple merge

diff --cc sql/tables.sql
index 32ff5e879e401ffe54b10c54a2e69353159a5a59,fdd60bfbc97443072ef7d44ff844f80db7c4a431..8dae06d55ece6b46b30811e12cd65310fc10ff2c
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -37,19 -49,12 +37,10 @@@ CREATE TABLE new_query_log 
    secret text
    );
  CREATE INDEX idx_new_query_log_starttime ON new_query_log USING BTREE (starttime);
- GRANT INSERT ON new_query_log TO "www-data" ;
- GRANT UPDATE ON new_query_log TO "www-data" ;
- GRANT SELECT ON new_query_log TO "www-data" ;
+ GRANT INSERT ON new_query_log TO "{www-user}" ;
+ GRANT UPDATE ON new_query_log TO "{www-user}" ;
+ GRANT SELECT ON new_query_log TO "{www-user}" ;
  
- --drop table IF EXISTS report_log;
- CREATE TABLE report_log (
-   starttime timestamp,
-   ipaddress text,
-   query text,
-   description text,
-   email text
-   );
- GRANT INSERT ON report_log TO "www-data" ;
 -create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
 -useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
  
  drop table IF EXISTS word;
  CREATE TABLE word (

diff --cc utils/setup.php
index 32b5670060660a9afd2029e1968ae29319c2bafe,f7ebafa6d6c3069d288634fc311b5bcd7706b5a6..a31fbadfa2d102565a80e2b148f26336e0fc8ba5
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -191,9 -191,16 +191,16 @@@
                {
                        $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
                }
-               $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
+               if (CONST_Tablespace_Osm2pgsql_Data)
+                       $osm2pgsql .= ' --tablespace-slim-data '.CONST_Tablespace_Osm2pgsql_Data;
+               if (CONST_Tablespace_Osm2pgsql_Index)
+                       $osm2pgsql .= ' --tablespace-slim-index '.CONST_Tablespace_Osm2pgsql_Index;
+               if (CONST_Tablespace_Place_Data)
+                       $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
+               if (CONST_Tablespace_Place_Index)
+                       $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -              $osm2pgsql .= ' -C '.$iCacheMemory;
 +              $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);