From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 15 Jan 2021 08:10:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~187
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3cdfe066336ad19772d300a85d6c1feaadc074ea?hp=-c

Merge remote-tracking branch 'upstream/master'
---

3cdfe066336ad19772d300a85d6c1feaadc074ea
diff --combined CMakeLists.txt
index 3fad37d7,1c274594..4915d764
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -98,7 -98,6 +98,6 @@@ if (BUILD_IMPORTER
     set(CUSTOMSCRIPTS
         check_import_finished.php
         country_languages.php
-        importWikipedia.php
         export.php
         query.php
         setup.php
@@@ -111,6 -110,9 +110,9 @@@
         configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
                        ${PROJECT_BINARY_DIR}/utils/${script_source})
     endforeach()
+ 
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl
+                   ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -118,21 -120,6 +120,21 @@@
  #-----------------------------------------------------------------------------
  
  if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +
     add_custom_target(serve
             php -S 127.0.0.1:8088
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
diff --combined lib/admin/update.php
index 5bc2d73d,50f611d7..03fcdcaf
--- a/lib/admin/update.php
+++ b/lib/admin/update.php
@@@ -1,4 -1,5 +1,5 @@@
  <?php
+ @define('CONST_LibDir', dirname(dirname(__FILE__)));
  
  require_once(CONST_LibDir.'/init-cmd.php');
  require_once(CONST_LibDir.'/setup_functions.php');
@@@ -52,7 -53,6 +53,7 @@@ loadSettings($aCMDResult['project-dir'
  setupHTTPProxy();
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');