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;hp=-c

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
---

3b960a5bf343f5617326f162c6df3399dce34930
diff --combined settings/settings.php
index 33bdad51,26b48551..3de1e73b
--- a/settings/settings.php
+++ b/settings/settings.php
@@@ -13,7 -13,7 +13,7 @@@
  
  	// 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');
  
@@@ -41,14 -41,12 +41,14 @@@
  
  	// Website settings
  	@define('CONST_NoAccessControl', true);
 -	@define('CONST_ClosedForIndexing', false);
 -	@define('CONST_ClosedForIndexingExceptionIPs', '');
  	@define('CONST_BlockedIPs', '');
 +	@define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
 +	@define('CONST_WhitelistedIPs', '');
 +	@define('CONST_BlockedUserAgents', '');
 +	@define('CONST_BlockReverseMaxLoad', 15);
  	@define('CONST_BulkUserIPs', '');
  
 -	@define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 +	@define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
  	@define('CONST_Tile_Default', 'Mapnik');
  
  	@define('CONST_Default_Language', 'xx');
diff --combined utils/setup.php
index 45b40fed,473d0cb0..6bd21055
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -95,7 -95,7 +95,7 @@@
  		{
  			fail('database already exists ('.CONST_Database_DSN.')');
  		}
- 		passthruCheckReturn('createdb -E UTF-8 '.$aDSNInfo['database']);
+ 		passthruCheckReturn('createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
  	}
  
  	if ($aCMDResult['setup-db'] || $aCMDResult['all'])
@@@ -114,7 -114,7 +114,7 @@@
  			exit;
  		}
  
- 		passthru('createlang plpgsql '.$aDSNInfo['database']);
+ 		passthru('createlang plpgsql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
  		$pgver = (float) CONST_Postgresql_Version;
  		if ($pgver < 9.1) {
  			pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
@@@ -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);
  
@@@ -451,7 -451,7 +452,7 @@@
  		$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
  		$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
  		$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
 -		$sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
 +		$sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
  		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
  
  		$sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@@ -537,7 -537,7 +538,7 @@@
  		$bDidSomething = true;
  		$sOutputFile = '';
  		if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
- 		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
+ 		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$iInstances.$sOutputFile;
  		passthruCheckReturn($sBaseCmd.' -R 4');
  		if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
  		passthruCheckReturn($sBaseCmd.' -r 5 -R 25');