Merge remote-tracking branch 'upstream/master'

[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 d76a816fbfb652dad64a713d869602ea2dc9cad2..8aeedcc6c72ea5dffe38a06a16922f1c407c2e80 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -7,7 +7,7 @@
 # ================================
 #
 # These instructions expect that you have a freshly installed CentOS version 7.
 # ================================
 #
 # These instructions expect that you have a freshly installed CentOS version 7.

-# Make sure all packages are are up-to-date by running:
+# Make sure all packages are up-to-date by running:

 #
     sudo yum update -y
 
 #
     sudo yum update -y
 


@@ -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
                         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 \
 
     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


@@ -84,7 +85,8 @@
 
 #
 # Finally, we need to add two postgres users: one for the user that does
 
 #
 # 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
 #
 
     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
 <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>
 


@@ -141,14 +144,21 @@ 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:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 
 #DOCS:    cd Nominatim
 
 else                               #DOCS:
     cd $USERHOME                   #DOCS:
 fi                                 #DOCS:
 

-# 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:
+
+if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:
+    wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+fi                                 #DOCS:
+
+# The code must be built in a separate directory. Create this directory,

 # then configure and build Nominatim in there:
 
     mkdir build
 # then configure and build Nominatim in there:
 
     mkdir build