update docs/*.md based on vagrant/*.sh

diff --git a/docs/install-on-centos-7.md b/docs/install-on-centos-7.md
index 037f41beb536d8f9eb3977379e937868c682ede6..e6b7c9460563066964f8aeda2744d0155b3a0d8d 100644 (file)
--- a/docs/install-on-centos-7.md
+++ b/docs/install-on-centos-7.md
@@ -27,9 +27,10 @@ If you want to run the test suite, you need to install the following
 additional packages:
 
     sudo yum install -y python-pip python-Levenshtein python-psycopg2 \
 additional packages:
 
     sudo yum install -y python-pip python-Levenshtein python-psycopg2 \

-                        php-phpunit-PHPUnit
+                        python-numpy php-phpunit-PHPUnit

     pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \
                                  haversine Shapely pytidylib
     pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \
                                  haversine Shapely pytidylib

+    sudo pear install PHP_CodeSniffer

 
 
 System Configuration
 
 
 System Configuration


@@ -102,6 +103,7 @@ sudo tee /etc/httpd/conf.d/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>
 

diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md
index b03685cf2303e3efddb50e95bdb678596f511f10..2baacc81718646a810ddf071a9b28af3a458de58 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:
 


@@ -29,11 +32,10 @@ Now you can install all packages needed for Nominatim:
 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>