fix docs link in update interval error message (#3479)

[nominatim.git] / settings / env.defaults

diff --git a/settings/env.defaults b/settings/env.defaults
index 7fe09fa4dc8ceb54c29e77c636249624bdbec693..f4c33e7720abda310c95fd5012a4aaf5000a5baa 100644 (file)
--- a/settings/env.defaults
+++ b/settings/env.defaults
@@ -77,20 +77,10 @@ NOMINATIM_HTTP_PROXY_PASSWORD=
 # EXPERT ONLY. You should usually use the supplied osm2pgsql.
 NOMINATIM_OSM2PGSQL_BINARY=
 
 # EXPERT ONLY. You should usually use the supplied osm2pgsql.
 NOMINATIM_OSM2PGSQL_BINARY=
 

-# Directory where to find US Tiger data files to import.
-# OBSOLETE: use `nominatim add-data --tiger-data <dir>` to explicitly state
-#           the directory on import
-NOMINATIM_TIGER_DATA_PATH=
-

 # Directory where to find pre-computed Wikipedia importance files.
 # When unset, the data is expected to be located in the project directory.
 NOMINATIM_WIKIPEDIA_DATA_PATH=
 
 # Directory where to find pre-computed Wikipedia importance files.
 # When unset, the data is expected to be located in the project directory.
 NOMINATIM_WIKIPEDIA_DATA_PATH=
 

-# Configuration file for special phrase import.
-# OBSOLETE: use `nominatim special-phrases --config <file>` or simply put
-#           a custom phrase-settings.json into your project directory.
-NOMINATIM_PHRASE_CONFIG=
-

 # Configuration file for rank assignments.
 NOMINATIM_ADDRESS_LEVEL_CONFIG=address-levels.json
 
 # Configuration file for rank assignments.
 NOMINATIM_ADDRESS_LEVEL_CONFIG=address-levels.json
 


@@ -133,9 +123,9 @@ NOMINATIM_TABLESPACE_ADDRESS_DATA=
 # Tablespace for indexes used during address computation. Used for import and update only.
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=
 
 # Tablespace for indexes used during address computation. Used for import and update only.
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=
 

-# Tablespace for tables for auxilary data, e.g. TIGER data, postcodes.
+# Tablespace for tables for auxiliary data, e.g. TIGER data, postcodes.

 NOMINATIM_TABLESPACE_AUX_DATA=
 NOMINATIM_TABLESPACE_AUX_DATA=

-# Tablespace for indexes for auxilary data, e.g. TIGER data, postcodes.
+# Tablespace for indexes for auxiliary data, e.g. TIGER data, postcodes.

 NOMINATIM_TABLESPACE_AUX_INDEX=
 
 
 NOMINATIM_TABLESPACE_AUX_INDEX=
 
 


@@ -193,7 +183,7 @@ NOMINATIM_SEARCH_BATCH_MODE=no
 
 # Threshold for searches by name only.
 # Threshold where the lookup strategy in the database is switched. If there
 
 # Threshold for searches by name only.
 # Threshold where the lookup strategy in the database is switched. If there

-# are less occurences of a tem than given, the search does the lookup only
+# are less occurrences of a tem than given, the search does the lookup only

 # against the name, otherwise it uses indexes for name and address.
 NOMINATIM_SEARCH_NAME_ONLY_THRESHOLD=500
 
 # against the name, otherwise it uses indexes for name and address.
 NOMINATIM_SEARCH_NAME_ONLY_THRESHOLD=500
 


@@ -215,8 +205,14 @@ NOMINATIM_SERVE_LEGACY_URLS=yes
 NOMINATIM_API_POOL_SIZE=10
 
 # Timeout is seconds after which a single query to the database is cancelled.
 NOMINATIM_API_POOL_SIZE=10
 
 # Timeout is seconds after which a single query to the database is cancelled.

+# The user receives a 503 response, when a query times out.
+# When empty, then timeouts are disabled.
+NOMINATIM_QUERY_TIMEOUT=10
+
+# Maximum time a single request is allowed to take. When the timeout is
+# exceeded, the available results are returned.

 # When empty, then timeouts are disabled.
 # When empty, then timeouts are disabled.

-NOMINATIM_QUERY_TIMEOUT=60
+NOMINATIM_REQUEST_TIMEOUT=60

 
 # Search elements just within countries
 # If, despite not finding a point within the static grid of countries, it
 
 # Search elements just within countries
 # If, despite not finding a point within the static grid of countries, it


@@ -239,5 +235,5 @@ NOMINATIM_LOG_DB=no
 NOMINATIM_LOG_FILE=
 
 # Echo raw SQL from SQLAlchemy statements.
 NOMINATIM_LOG_FILE=
 
 # Echo raw SQL from SQLAlchemy statements.

-# Works only in command line/library use.
+# EXPERT: Works only in command line/library use.

 NOMINATIM_DEBUG_SQL=no
 NOMINATIM_DEBUG_SQL=no