X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0df8a4e24f6129d3c2389d7cfc3f0515efb2f6f4..a8afb9bd3c8b35ffbf7881dbd808ef27e58ea7dc:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 07b929a1..a363fab3 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -1,7 +1,8 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
 	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
@@ -134,7 +135,7 @@
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
 		} else {
-			pgsqlRunScript('CREATE EXTENSION postgis');
+			pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');
 		}
 		if ($fPostgisVersion < 2.1) {
 			// Function was renamed in 2.1 and throws an annoying deprecation warning
@@ -219,9 +220,9 @@
 	{
 		echo "Functions\n";
 		$bDidSomething = true;
-		if (!file_exists(CONST_BasePath.'/module/nominatim.so')) fail("nominatim module not built");
+		if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built");
 		$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
-		$sTemplate = str_replace('{modulepath}', CONST_BasePath.'/module', $sTemplate);
+		$sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);
 		if ($aCMDResult['enable-diff-updates']) $sTemplate = str_replace('RETURN NEW; -- @DIFFUPDATES@', '--', $sTemplate);
 		if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
 		if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
@@ -292,7 +293,7 @@
 		echo "Functions\n";
 		$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
 		$sTemplate = str_replace('{modulepath}',
-			                     CONST_BasePath.'/module', $sTemplate);
+			                     CONST_InstallPath.'/module', $sTemplate);
 		pgsqlRunScript($sTemplate);
 	}
 
@@ -573,16 +574,16 @@
 		}
 		else
 		{
-			if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
+			if (file_exists(CONST_InstallPath.'/settings/configuration.txt'))
 			{
 				echo "settings/configuration.txt already exists\n";
 			}
 			else
 			{
-				passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
+				passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_InstallPath.'/settings');
 				// update osmosis configuration.txt with our settings
-				passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_BasePath.'/settings/configuration.txt');
-				passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_BasePath.'/settings/configuration.txt');
+				passthru("sed -i 's!baseUrl=.*!baseUrl=".CONST_Replication_Url."!' ".CONST_InstallPath.'/settings/configuration.txt');
+				passthru("sed -i 's:maxInterval = .*:maxInterval = ".CONST_Replication_MaxInterval.":' ".CONST_InstallPath.'/settings/configuration.txt');
 			}
 
 			// Find the last node in the DB
@@ -636,7 +637,7 @@
 				echo "Getting state file: $sRepURL\n";
 				$sStateFile = file_get_contents($sRepURL);
 				if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
-				file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
+				file_put_contents(CONST_InstallPath.'/settings/state.txt', $sStateFile);
 				echo "Updating DB status\n";
 				pg_query($oDB->connection, 'TRUNCATE import_status');
 				$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
@@ -657,7 +658,7 @@
 		$bDidSomething = true;
 		$sOutputFile = '';
 		if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
-		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$iInstances.$sOutputFile;
+		$sBaseCmd = CONST_InstallPath.'/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');
@@ -709,14 +710,14 @@
 			fail("Target directory does not exist.");
 		}
 
-		@symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php');
-		@symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
-		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
-		@symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
-		@symlink(CONST_BasePath.'/website/lookup.php', $sTargetDir.'/lookup.php');
-		@symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
-		@symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');
-		@symlink(CONST_BasePath.'/website/status.php', $sTargetDir.'/status.php');
+		@symlink(CONST_InstallPath.'/website/details.php', $sTargetDir.'/details.php');
+		@symlink(CONST_InstallPath.'/website/reverse.php', $sTargetDir.'/reverse.php');
+		@symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/search.php');
+		@symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/index.php');
+		@symlink(CONST_InstallPath.'/website/lookup.php', $sTargetDir.'/lookup.php');
+		@symlink(CONST_InstallPath.'/website/deletable.php', $sTargetDir.'/deletable.php');
+		@symlink(CONST_InstallPath.'/website/polygons.php', $sTargetDir.'/polygons.php');
+		@symlink(CONST_InstallPath.'/website/status.php', $sTargetDir.'/status.php');
 		@symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
 		@symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
 		@symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');
@@ -730,7 +731,7 @@
 		}
 	}
 
-	if (isset($aCMDResult['drop']))
+	if ($aCMDResult['drop'])
 	{
 		// The implementation is potentially a bit dangerous because it uses
 		// a positive selection of tables to keep, and deletes everything else.