remove 'closed for indexing' feature

[nominatim.git] / settings / settings.php

diff --git a/settings/settings.php b/settings/settings.php
index 04ffe1621caa785362c4a6d55aa69875029b9b43..8f2fb1d9f62a29e9f8a701ba08818b0831e98252 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,5 +1,8 @@
 <?php
-       if (file_exists(CONST_BasePath.'/settings/local.php')) require_once(CONST_BasePath.'/settings/local.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);
 
        // General settings
@@ -16,14 +19,8 @@
        @define('CONST_HTTP_Proxy_Login', '');
        @define('CONST_HTTP_Proxy_Password', '');
 
-       // Software versions
-       @define('CONST_Postgresql_Version', '9.3'); // values: 9.0, ... , 9.4
-       @define('CONST_Postgis_Version', '2.1'); // values: 1.5, 2.0, 2.1
-
        // Paths
-       @define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
-       @define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
-       @define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
+       @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
        @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
        @define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
 
@@ -78,8 +75,6 @@
 
        // Website settings
        @define('CONST_NoAccessControl', true);
-       @define('CONST_ClosedForIndexing', false);
-       @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_BulkUserIPs', '');
        @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs