Merge branch 'tigerlines' of https://github.com/markigail/Nominatim

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 0d55c4c838019216681b0b95ded454d4b45ac511..ea664683adc02d9606b71aa28888b45735dc8cbd 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,6 +1,7 @@
 <?php
        @define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
        @define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
+       if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
        if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
        if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
@@ -86,7 +87,7 @@
        @define('CONST_BulkUserIPs', '');
        @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
 
-       @define('CONST_Website_BaseURL', 'http://localhost/nominatim/');
+       @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Default_Language', false);