osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-25 14:02:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2358 from AntoJvlt/documentation-update

Browse Source 
Update documentation
This commit is contained in:
Sarah Hoffmann 2021-06-04 23:54:37 +02:00 committed by GitHub
commit f0a7850edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/admin/Customization.md
View File

@ -85,7 +85,7 @@ To do so, you have access to the following command:
nominatim special-phrases --import-from-csv <csv file>
```
Note that the 2 previous import commands will update the phrases from your database.
Note that the two previous import commands will update the phrases from your database.
This means that if you import some phrases from a csv file, only the phrases
present in the csv file will be kept into the database. All other phrases will
be removed.

9
docs/admin/Import.md
View File

@ -40,7 +40,7 @@ all commands from the project directory.
### Configuration setup in `.env`
The Nominatim server can be customized via an `.env` configuration file in the
The Nominatim server can be customized via an `.env` configuration file in the
project directory. This is a file in [dotenv](https://github.com/theskumar/python-dotenv)
format which looks the same as variable settings in a standard shell environment.
You can also set the same configuration via environment variables. All
@ -48,7 +48,7 @@ settings have a `NOMINATIM_` prefix to avoid conflicts with other environment
variables.
There are lots of configuration settings you can tweak. Have a look
at `settings/env.default` for a full list. Most should have a sensible default.
at `Nominatim/settings/env.default` for a full list. Most should have a sensible default.
#### Flatnode files
@ -193,12 +193,15 @@ can be found in the development section.
[Geofabrik](https://download.geofabrik.de).
Download the data to import. Then issue the following command
from the **build directory** to start the import:
from the **project directory** to start the import:
```sh
nominatim import --osm-file <data file> 2>&1 | tee setup.log
```
The **project directory** is the one that you have set up at the beginning.
See [creating the project directory](Import#creating-the-project-directory).
### Notes on full planet imports
Even on a perfectly configured machine

3
vagrant/Install-on-Ubuntu-20.sh
View File

@ -244,6 +244,9 @@ server {
EOF_NGINX_CONF
#DOCS:```
# If you have some errors, make sure that php7.4-fpm.sock is well under
# /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration
# to /var/run/php/php7.4-fpm.sock.
#
# Enable the configuration and restart Nginx
#