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 3a563541d2396046dd606e3c6f72c0976ebf4a65..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 \
 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>
 


@@ -141,13 +143,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: