Merge remote-tracking branch 'upstream/master'

[nominatim.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index 3a8e479bde7283329dfc4c02064d1a4bead35ed8..56a634325691a1e76bf8edc4bece91aa1b95d6c5 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -17,7 +17,7 @@ is.
 
 3. Nominatim 
 
-        git clone --recursive https://github.com/twain47/Nominatim.git
+        git clone --recursive https://github.com/openstreetmap/Nominatim.git
 
     If you haven't used `--recursive`, then you can load the submodules using
     
@@ -30,11 +30,11 @@ is.
 
 1. Start the virtual machine
 
-        vagrant up
+        vagrant up ubuntu
 
 2. Log into the virtual machine
 
-        vagrant ssh
+        vagrant ssh ubuntu
 
 3. Import a small country (Monaco)
 
@@ -45,16 +45,15 @@ is.
 
   ```
   # inside the virtual machine:
-  cd Nominatim
-    wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
-    ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
-    ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
-    psql -d nominatim -f data/specialphrases_countries.sql
+  mkdir data
+  cd build
+    wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
+    ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
     ```
 
   To repeat an import you'd need to delete the database first
 
-        dropdb --username postgres -if-exists nominatim
+        dropdb -if-exists nominatim
 
 
 
@@ -131,9 +130,11 @@ 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 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.