safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Moved settings-frontend to website/

Browse Source
This commit is contained in:
K Rahul Reddy
2020-06-19 22:06:23 +05:30
parent 37f0b51dff
commit a3201be7e7
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/website.tmpl
View File

@@ -1,3 +1,3 @@
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
require_once(CONST_BasePath.'/@script_source@');

2
docs/admin/Import.md
View File

@@ -197,7 +197,7 @@ Run this script to verify all required tables and indices got created successful
### Setting up the website
Run the following command to set up the `settings/settings-frontend.php`.
Run the following command to set up the `website/settings-frontend.php`.
These settings are used in website/*.php files. You can use the website only after this
step is completed.

10
lib/setup/SetupClass.php
View File

@@ -695,17 +695,13 @@ class SetupFunctions
}
/**
* Setup settings_test.php in the build/settings directory from build/.env file
* Setup settings-frontend.php in the build/website directory
*
* @return null
*/
public function setupWebsite()
{
$rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
// Currently using CONST_BasePath and CONST_InstallPath.
// Once dotenv is setup, getenv() can be used, or another
// alternate option is to build settings_test.php using cmake.
$rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w');
fwrite($rOutputFile, "<?php
@define('CONST_BasePath', '".CONST_BasePath."');
@@ -734,7 +730,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
@define('CONST_Use_US_Tiger_Data', ".(CONST_Use_US_Tiger_Data ? 'true' : 'false').");
@define('CONST_Website_BaseURL', '".CONST_Website_BaseURL."');
");
info(CONST_InstallPath.'/settings/settings-frontend.php has been set up successfully');
info(CONST_InstallPath.'/website/settings-frontend.php has been set up successfully');
}
private function removeFlatnodeFile()