Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 8d8739ddc84446e099cdd955b846e6ab98961efa,7ab4fb7c6a9bf65c5ba916b504152b3661d58f47..052695c6eb3bbf491958c745d244b7c0db800fbe
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -38,6 -38,7 +38,7 @@@ set(BUILD_TESTS on CACHE BOOL "Build te
  set(BUILD_DOCS on CACHE BOOL "Build documentation")
  set(BUILD_MANPAGE on CACHE BOOL "Build Manual Page")
  set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)")
+ set(INSTALL_MUNIN_PLUGINS on CACHE BOOL "Install Munin plugins for supervising Nominatim")
  
  #-----------------------------------------------------------------------------
  #  osm2pgsql (imports/updates only)
@@@ -113,27 -114,6 +114,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +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()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -220,7 -200,7 +221,7 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_MANPAGE)
-    add_subdirectory(manual)
+    add_subdirectory(man)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -232,6 -212,7 +233,7 @@@ include(GNUInstallDirs
  set(NOMINATIM_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME})
  set(NOMINATIM_LIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
  set(NOMINATIM_CONFIGDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${PROJECT_NAME})
+ set(NOMINATIM_MUNINDIR ${CMAKE_INSTALL_FULL_DATADIR}/munin/plugins)
  
  if (BUILD_IMPORTER)
      configure_file(${PROJECT_SOURCE_DIR}/cmake/tool-installed.tmpl installed.bin)
@@@ -280,6 -261,15 +282,15 @@@ install(FILES settings/env.default
                settings/import-full.style
                settings/import-extratags.style
                settings/icu_tokenizer.yaml
-               settings/icu-rules/extended-unicode-to-asccii.yaml
                settings/country_settings.yaml
          DESTINATION ${NOMINATIM_CONFIGDIR})
+ 
+ install(DIRECTORY settings/icu-rules
+         DESTINATION ${NOMINATIM_CONFIGDIR})
+ 
+ if (INSTALL_MUNIN_PLUGINS)
+     install(FILES munin/nominatim_importlag
+                   munin/nominatim_query_speed
+                   munin/nominatim_requests
+             DESTINATION ${NOMINATIM_MUNINDIR})
+ endif()