X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3a41b0dfbf3860826911dbb0b36b546bc02ffe28..3a696e1895ccd87ea03c16412870003630f3e23f:/vagrant/install-on-centos-7.sh

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index d76a816f..62e718e5 100755
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -25,12 +25,13 @@
                         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
@@ -84,7 +85,8 @@
 
 #
 # 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
@@ -102,6 +104,7 @@ sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
+  DirectoryIndex search.php
   Require all granted
 </Directory>
 
@@ -141,14 +144,14 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
 #DOCS:    cd Nominatim
 
 else                               #DOCS:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 
-# The code is built in a special directory. Create this directory,
+# The code must be built in a separate directory. Create this directory,
 # then configure and build Nominatim in there:
 
     mkdir build