hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1829 from krahulreddy/websiteSetup

Browse Source 
Added setup-website option
This commit is contained in:
Sarah Hoffmann
2020-07-01 18:11:50 +02:00
committed by GitHub
parent 6478058946 a3201be7e7
commit 354487d7f4
5 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/setup.php
View File

@@ -44,6 +44,7 @@ $aCMDOptions
array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
array('create-country-names', '', 0, 1, 0, 0, 'bool', 'Create default list of searchable country names'),
array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
array('setup-website', '', 0, 1, 0, 0, 'bool', 'Used to compile environment variables for the website (EXPERIMENTAL)'),
);
// $aCMDOptions passed to getCmdOpt by reference
@@ -76,15 +77,17 @@ if ($aCMDResult['create-db'] || $aCMDResult['all']) {
$oSetup->createDB();
}
$oSetup->connect();
if (!$aCMDResult['setup-website']) {
$oSetup->connect();
// Try accessing the C module, so we know early if something is wrong
checkModulePresence(); // raises exception on failure
}
if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
$bDidSomething = true;
$oSetup->setupDB();
}
// Try accessing the C module, so we know early if something is wrong
checkModulePresence(); // raises exception on failure
if ($aCMDResult['import-data'] || $aCMDResult['all']) {
$bDidSomething = true;
@@ -153,6 +156,11 @@ if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
$oSetup->createCountryNames($aCMDResult);
}
if ($aCMDResult['setup-website'] || $aCMDResult['all']) {
$bDidSomething = true;
$oSetup->setupWebsite();
}
// ******************************************************
// If we did something, repeat the warnings
if (!$bDidSomething) {