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

Merge pull request #1884 from lonvia/fixes-for-webserver-settigns

Browse Source 
Small fixes for new webserver settings file
This commit is contained in:
Sarah Hoffmann
2020-07-18 11:44:01 +02:00
committed by GitHub
parent 1181ceb735 3efe0dc8dc
commit 1b95ec5591
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/website.tmpl
View File

@@ -1,5 +1,5 @@
<?php <?php
@define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug'])); @define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php'); require_once(dirname(dirname(__FILE__)).'/settings/settings-frontend.php');
require_once(CONST_BasePath.'/@script_source@'); require_once(CONST_BasePath.'/@script_source@');

4
lib/setup/SetupClass.php
View File

@@ -701,7 +701,7 @@ class SetupFunctions
*/ */
public function setupWebsite() public function setupWebsite()
{ {
$rOutputFile = fopen(CONST_InstallPath.'/website/settings-frontend.php', 'w'); $rOutputFile = fopen(CONST_InstallPath.'/settings/settings-frontend.php', 'w');
fwrite($rOutputFile, "<?php fwrite($rOutputFile, "<?php
@define('CONST_BasePath', '".CONST_BasePath."'); @define('CONST_BasePath', '".CONST_BasePath."');
@@ -715,7 +715,7 @@ if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SE
@define('CONST_Map_Tile_URL', '".CONST_Map_Tile_URL."'); @define('CONST_Map_Tile_URL', '".CONST_Map_Tile_URL."');
@define('CONST_Map_Tile_Attribution', '".CONST_Map_Tile_Attribution."'); // Set if tile source isn't osm.org @define('CONST_Map_Tile_Attribution', '".CONST_Map_Tile_Attribution."'); // Set if tile source isn't osm.org
@define('CONST_Log_DB', ".(CONST_Log_DB ? 'true' : 'false')."); @define('CONST_Log_DB', ".(CONST_Log_DB ? 'true' : 'false').");
@define('CONST_Log_File', ".(CONST_Log_File ? 'true' : 'false')."); @define('CONST_Log_File', ".(CONST_Log_File ? ("'".CONST_Log_File."'") : 'false').");
@define('CONST_Max_Word_Frequency', '".CONST_Max_Word_Frequency."'); @define('CONST_Max_Word_Frequency', '".CONST_Max_Word_Frequency."');
@define('CONST_NoAccessControl', ".CONST_NoAccessControl."); @define('CONST_NoAccessControl', ".CONST_NoAccessControl.");
@define('CONST_Places_Max_ID_count', ".CONST_Places_Max_ID_count."); @define('CONST_Places_Max_ID_count', ".CONST_Places_Max_ID_count.");