Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / install-on-ubuntu-16.md

diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md
index 859d57127cf7c214a59b94b84a41fede0b51e9fc..66d82cf0090f2145ddbf0aec9889bf1dd557b0eb 100644 (file)
--- a/docs/install-on-ubuntu-16.md
+++ b/docs/install-on-ubuntu-16.md
@@ -3,6 +3,9 @@
 
 
 
+
+
+
 *Note:* these installation instructions are also available in executable
         form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
 
@@ -14,8 +17,8 @@ These instructions expect that you have a freshly installed Ubuntu 16.04.
 Make sure all packages are are up-to-date by running:
 
 
+
     sudo apt-get update -qq
-    sudo apt-get upgrade -y
 
 Now you can install all packages needed for Nominatim:
 
@@ -27,13 +30,12 @@ Now you can install all packages needed for Nominatim:
                             git
 
 If you want to run the test suite, you need to install the following
-aditional packages:
+additional packages:
 
-    sudo apt-get install -y python-dev python-pip python-levenshtein python-shapely \
-                            python-psycopg2 tidy python-nose python-tidylib \
-                            phpunit
+    sudo apt-get install -y python3-dev python3-pip python3-psycopg2 python3-tidylib phpunit
 
-    pip install --user lettuce==0.2.18 six==1.7 haversine
+    pip3 install --user behave nose # urllib3
+    sudo pear install PHP_CodeSniffer
 
 
 System Configuration
@@ -80,7 +82,8 @@ Restart the postgresql service after updating this config file.
 
 
 Finally, we need to add two postgres users: one for the user that does
-the import and another for the webserver ro access the database:
+the import and another for the webserver which should access the database
+for reading only:
 
 
     sudo -u postgres createuser -s $USERNAME
@@ -98,6 +101,7 @@ sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
+  DirectoryIndex search.php
   Require all granted
 </Directory>
 
@@ -126,14 +130,21 @@ Get the source code from Github and change into the source directory
 
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim
 
 
 
 
 
-The code is built in a special directory. Create this directory,
+When installing the latest source from github, you also need to
+download the country grid:
+
+
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+
+
+The code must be built in a separate directory. Create this directory,
 then configure and build Nominatim in there:
 
     mkdir build