Merge pull request #661 from mtmail/travis-ci-badge

[nominatim.git] / vagrant / install-on-centos-7.sh

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index 7e023cbef9487012df7f32a95ab15fd2402e3ed6..62e718e5d8c9c9074938c392e8ec04d43070d566 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -28,9 +28,10 @@
 # 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


@@ -103,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
 <Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php

+  DirectoryIndex search.php

   Require all granted
 </Directory>
 
   Require all granted
 </Directory>
 


@@ -142,7 +144,7 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 if [ "x$1" == "xyes" ]; then  #DOCS:
 
     cd $USERHOME
 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:
 #DOCS:    cd Nominatim
 
 else                               #DOCS: