Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / install-on-centos-7.md

diff --git a/docs/install-on-centos-7.md b/docs/install-on-centos-7.md
index 037f41beb536d8f9eb3977379e937868c682ede6..40e8a4042e749b4602752531e2ee3e4cdce0020d 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 \
-                        php-phpunit-PHPUnit
+                        python-numpy php-phpunit-PHPUnit
     pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \
                                  haversine Shapely pytidylib
+    sudo pear install PHP_CodeSniffer
 
 
 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
+  DirectoryIndex search.php
   Require all granted
 </Directory>
 
@@ -148,6 +150,13 @@ Get the source code from Github and change into the source 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: