From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 19 Dec 2014 19:20:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~494
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c68a8c9f2d4898bbc0fa5a13200b888093c0e808?hp=--cc

Merge remote-tracking branch 'upstream/master'

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

c68a8c9f2d4898bbc0fa5a13200b888093c0e808
diff --cc sql/tables.sql
index 32ff5e87,fdd60bfb..8dae06d5
--- a/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 32b56700,f7ebafa6..a31fbadf
--- a/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);