Merge remote-tracking branch 'upstream/master' into cmake-port

[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 afdeccd94f794c1f2b5a7febf56998ede3b1cb7f..cd1ddfb03b0e9be5ca305cb4ea5abd76c6adabd5 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -24,6 +24,15 @@
                         php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                         bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
 
                         php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                         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
+# additional packages:
+
+    sudo yum install -y python-pip python-Levenshtein python-psycopg2 \
+                        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
 # ====================
 #
 # System Configuration
 # ====================


@@ -76,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


@@ -90,7 +100,7 @@
 # configuration. Add a separate nominatim configuration to your webserver:
 
 #DOCS:```
 # configuration. Add a separate nominatim configuration to your webserver:
 
 #DOCS:```

-sudo cat > /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
+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


@@ -130,34 +140,35 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
 #
 # Get the source code from Github and change into the source directory
 #
 #
 # Get the source code from Github and change into the source directory
 #

-if [ "x$CHECKOUT" == "xy" ]; then  #DOCS:
+if [ "x$1" == "xyes" ]; then  #DOCS:

 
     cd $USERHOME
 
     cd $USERHOME

-    sudo -u $USERNAME git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/twain47/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,
+# The code must be built in a separate directory. Create this directory,

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

-    sudo -u $USERNAME mkdir build
+    mkdir build

     cd build
     cd build

-    sudo -u $USERNAME cmake $USERHOME/Nominatim
-    sudo -u $USERNAME make
+    cmake $USERHOME/Nominatim
+    make

 
 # You need to create a minimal configuration file that tells nominatim
 
 # You need to create a minimal configuration file that tells nominatim

-# the name of your webserver user:
+# the name of your webserver user and the URL of the website:

 
 #DOCS:```
 
 #DOCS:```

-sudo -u $USERNAME cat > settings/local.php << EOF
+tee settings/local.php << EOF

 <?php
  @define('CONST_Database_Web_User', 'apache');
 <?php
  @define('CONST_Database_Web_User', 'apache');

+ @define('CONST_Website_BaseURL', '/nominatim/');

 EOF
 #DOCS:```
 
 
 EOF
 #DOCS:```
 
 

-Nominatim is now ready to use. Continue with
-[importing a database from OSM data](Import_and_update.md).
+# Nominatim is now ready to use. Continue with
+# [importing a database from OSM data](Import_and_update.md).