From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 5 Dec 2018 20:40:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~302
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/414e6f089fc361ac22e28227be2d34a256226505

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

414e6f089fc361ac22e28227be2d34a256226505
diff --cc CMakeLists.txt
index 7c5763fd,7d401ade..8f9de5ec
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -103,15 -102,9 +102,20 @@@ set(WEBSITESCRIPT
      website/reverse.php
      website/search.php
      website/status.php
-     website/403.html
-     website/509.html
-     website/crossdomain.xml
-     website/favicon.ico
-     website/last_update.php
-     website/nominatim.xml
-     website/robots.txt
-     website/taginfo.json
-     utils/blocks.php
+ )
+ 
++set(WEBSITEFILES
++    403.html
++    509.html
++    crossdomain.xml
++    favicon.ico
++    last_update.php
++    nominatim.xml
++    robots.txt
++    taginfo.json
++)
++
+ set(CUSTOMSCRIPTS
      utils/country_languages.php
      utils/importWikipedia.php
      utils/export.php
@@@ -123,11 -115,18 +126,23 @@@
      utils/warm.php
     )
  
- foreach (cfile ${CUSTOMFILES})
-     configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+ foreach (script_source ${CUSTOMSCRIPTS})
+     configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                    ${PROJECT_BINARY_DIR}/${script_source})
  endforeach()
  
- configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+ foreach (script_source ${WEBSITESCRIPTS})
+     configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                    ${PROJECT_BINARY_DIR}/${script_source})
+ endforeach()
+ 
++foreach (webfile ${WEBSITEFILES})
++    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
++                   ${PROJECT_BINARY_DIR}/website/${webfile})
++endforeach()
++
+ configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+                ${PROJECT_BINARY_DIR}/settings/settings.php)
  
  set(WEBPATHS css images js)
  
diff --cc utils/update.php
index a5170ae5,24095ef4..05c43946
mode 100755,100644..100644
--- a/utils/update.php
+++ b/utils/update.php
diff --cc website/reverse.php
index 075d4cf0,0ba17714..6864d65e
mode 100755,100644..100644
--- a/website/reverse.php
+++ b/website/reverse.php