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 7c3bc97b5d7e1cdb3fd131cd893751202576ee4b..40e8a4042e749b4602752531e2ee3e4cdce0020d 100644 (file)
--- a/docs/install-on-centos-7.md
+++ b/docs/install-on-centos-7.md
@@ -24,12 +24,13 @@ Now you can install all packages needed for Nominatim:
                         bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
 
 If you want to run the test suite, you need to install the following
-aditional packages:
+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
@@ -83,7 +84,8 @@ Now start 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
+only for reading:
 
 
     sudo -u postgres createuser -s $USERNAME
@@ -101,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>
 
@@ -140,14 +143,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