From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 30 Dec 2020 10:30:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~188
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c3238682a8867edfb3c052ca4d2d27b3926ad17a?hp=--cc

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

c3238682a8867edfb3c052ca4d2d27b3926ad17a
diff --cc CMakeLists.txt
index 816ce647,b4f4ddb8..3fad37d7
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -118,44 -118,6 +118,21 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_API)
-    set(WEBSITESCRIPTS
-        website/deletable.php
-        website/details.php
-        website/lookup.php
-        website/polygons.php
-        website/reverse.php
-        website/search.php
-        website/status.php
-    )
- 
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
-    foreach (script_source ${WEBSITESCRIPTS})
-        configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
-                       ${PROJECT_BINARY_DIR}/${script_source})
-    endforeach()
- 
-    set(WEBPATHS css images js)
- 
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +
-    foreach (wp ${WEBPATHS})
-        execute_process(
-            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-        )
-    endforeach()
- 
     add_custom_target(serve
             php -S 127.0.0.1:8088
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
diff --cc utils/update.php
index 6e6a99ab,931ca179..5bc2d73d
--- a/utils/update.php
+++ b/utils/update.php
@@@ -46,8 -48,10 +48,11 @@@ $aCMDOption
  
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
+ loadSettings($aCMDResult['project-dir'] ?? getcwd());
+ 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');