Merge remote-tracking branch 'upstream/master'

[nominatim.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index c662d5e40302b5acb6f1d83270d0b946cceb638e..e6a0fbb371c66f787a45c18c239f4a5ced60d320 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -30,11 +30,11 @@ is.
 
 1. Start the virtual machine
 
 
 1. Start the virtual machine
 

-        vagrant up
+        vagrant up ubuntu

 
 2. Log into the virtual machine
 
 
 2. Log into the virtual machine
 

-        vagrant ssh
+        vagrant ssh ubuntu

 
 3. Import a small country (Monaco)
 
 
 3. Import a small country (Monaco)
 


@@ -54,7 +54,7 @@ is.
 
   To repeat an import you'd need to delete the database first
 
 
   To repeat an import you'd need to delete the database first
 

-        dropdb --username postgres -if-exists nominatim
+        dropdb -if-exists nominatim

 
 
 
 
 
 


@@ -129,11 +129,13 @@ No. Long running Nominatim installations will differ once new import features (o
 bug fixes) get added since those usually only get applied to new/changed data.
 
 Also this document skips the optional Wikipedia data import which affects ranking
 bug fixes) get added since those usually only get applied to new/changed data.
 
 Also this document skips the optional Wikipedia data import which affects ranking

-of search results. See [Nominatim instllation](http://wiki.openstreetmap.org/wiki/Nominatim/Installation) for details.
+of search results. See [Nominatim installation](http://wiki.openstreetmap.org/wiki/Nominatim/Installation) for details.

 
 

-##### Why Ubuntu, can I test CentOS/CoreOS/FreeBSD?
+##### Why Ubuntu and CentOS, can I test CentOS/CoreOS/FreeBSD?

 
 

-In general Nominatim will run in all these environment. The installation steps
+There is a Vagrant script for CentOS available. Simply start your box
+with `vagrant up centos` and then log in with `vagrant ssh centos`.
+In general Nominatim will also run in the other environments. The installation steps

 are slightly different, e.g. the name of the package manager, Apache2 package
 name, location of files. We chose Ubuntu because that is closest to the
 nominatim.openstreetmap.org production environment.
 are slightly different, e.g. the name of the package manager, Apache2 package
 name, location of files. We chose Ubuntu because that is closest to the
 nominatim.openstreetmap.org production environment.


@@ -158,6 +160,8 @@ you edit `settings/local.php` with
 
     pgsql://postgres@localhost:9999/nominatim_it
 
 
     pgsql://postgres@localhost:9999/nominatim_it
 

+To access postgres directly remember to specify the hostname, e.g. `psql --host localhost --port 9999 nominatim_it`
+

 
 ##### My computer is slow and the import takes too long. Can I start the virtual machine "in the cloud"?
 
 
 ##### My computer is slow and the import takes too long. Can I start the virtual machine "in the cloud"?