X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/06d89e1d470c2b95dee7925dca25643a6afc9882..e1b096cf8cf1ac6904c9adf0963f0e1756ca65ea:/settings/env.defaults?ds=sidebyside diff --git a/settings/env.defaults b/settings/env.defaults index fbad3e33..e2eda340 100644 --- a/settings/env.defaults +++ b/settings/env.defaults @@ -57,6 +57,9 @@ NOMINATIM_HTTP_PROXY_HOST=proxy.mydomain.com NOMINATIM_HTTP_PROXY_PORT=3128 NOMINATIM_HTTP_PROXY_LOGIN= NOMINATIM_HTTP_PROXY_PASSWORD= +# Also set these standard environment variables. +# HTTP_PROXY="http://user:pass@10.10.1.10:1080" +# HTTPS_PROXY="http://user:pass@10.10.1.10:1080" # Location of the osm2pgsql binary. # When empty, osm2pgsql is expected to reside in the osm2pgsql directory in @@ -64,10 +67,6 @@ NOMINATIM_HTTP_PROXY_PASSWORD= # EXPERT ONLY. You should usually use the supplied osm2pgsql. NOMINATIM_OSM2PGSQL_BINARY= -# Location of pyosmium-get-changes. -# Only needed when running updates. -NOMINATIM_PYOSMIUM_BINARY= - # Directory where to find US Tiger data files to import. # Used with setup.php --import-tiger-data. When unset, the data is expected # to be located under 'data/tiger' in the source tree.