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 8ddad65e8e7494427a3369fd609ee3e747c724e3..de8468d42a232acadc063ea0efb83bd163e7a40a 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.
 
 *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:
 
 
 Make sure all packages are are up-to-date by running:
 
 

+

     sudo apt-get update -qq
     sudo apt-get update -qq

-    sudo apt-get upgrade -y

 
 Now you can install all packages needed for Nominatim:
 
 
 Now you can install all packages needed for Nominatim:
 


@@ -24,16 +27,15 @@ Now you can install all packages needed for Nominatim:
                             libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 postgresql-contrib-9.5 \
                             apache2 php php-pgsql libapache2-mod-php php-pear php-db \
                             libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 postgresql-contrib-9.5 \
                             apache2 php php-pgsql libapache2-mod-php php-pear php-db \

-                            git
+                            php-intl git

 
 If you want to run the test suite, you need to install the following
 additional packages:
 
 
 If you want to run the test suite, you need to install the following
 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
 
 
 System Configuration


@@ -99,6 +101,7 @@ sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
 <Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php

+  DirectoryIndex search.php

   Require all granted
 </Directory>
 
   Require all granted
 </Directory>
 


@@ -127,13 +130,20 @@ Get the source code from Github and change into the source directory
 
 
     cd $USERHOME
 
 
     cd $USERHOME

-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git

     cd Nominatim
 
 
 
 
 
     cd Nominatim
 
 
 
 
 

+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:
 
 The code must be built in a separate directory. Create this directory,
 then configure and build Nominatim in there: