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 32a12e9e2f227655e08bf5e432259b233c66afc0..8b283ef63f1b7af7b953f54a91828f6459bb5ea5 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #
 # *Note:* these installation instructions are also available in executable
 #!/bin/bash
 #
 # *Note:* these installation instructions are also available in executable

-#         form for use with vagrant in the vagrant/ directory.
+#         form for use with vagrant under vagrant/install-on-centos-7.sh.

 #
 # Installing the Required Software
 # ================================
 #
 # These instructions expect that you have a freshly installed CentOS version 7.
 #
 # Installing the Required Software
 # ================================
 #
 # 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
 


@@ -21,9 +21,18 @@
 
     sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \
 
     sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \

-                        php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
+                        php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel proj-epsg \

                         bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-devel
 
                         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
 # ====================


@@ -52,6 +61,10 @@
 #
 # **Never, ever run the installation as a root user.** You have been warned.
 #
 #
 # **Never, ever run the installation as a root user.** You have been warned.
 #

+# Make sure that system servers can read from the home directory:
+
+    chmod a+x $USERHOME
+

 # Setting up PostgreSQL
 # ---------------------
 #
 # Setting up PostgreSQL
 # ---------------------
 #


@@ -63,8 +76,8 @@
 
 #
 # Next tune the postgresql configuration, which is located in 
 
 #
 # Next tune the postgresql configuration, which is located in 

-# `/var/lib/pgsql/data/postgresql.conf`. See
-# [the wiki](http://wiki.openstreetmap.org/wiki/Nominatim/Installation#PostgreSQL_Tuning_and_Configuration) for the parameters to change.
+# `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in
+# [the installation page](Installation.md) for the parameters to change.

 #
 # Now start the postgresql service after updating this config file.
 
 #
 # Now start the postgresql service after updating this config file.
 


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


@@ -86,10 +100,12 @@
 # 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

+  DirectoryIndex search.php
+  Require all granted

 </Directory>
 
 Alias /nominatim $USERHOME/build/website  #DOCS:Alias /nominatim $USERHOME/Nominatim/build/website
 </Directory>
 
 Alias /nominatim $USERHOME/build/website  #DOCS:Alias /nominatim $USERHOME/Nominatim/build/website


@@ -125,34 +141,42 @@ 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/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:
 
 # 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).