Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / install-on-ubuntu-16.sh

diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index f7af07c6c1cf4ec36b93a33453be9be0012cf3e6..81a8a92620162e5be2f833ac671f7e56378da69e 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -3,6 +3,9 @@
 # hacks for broken vagrant box      #DOCS:
 sudo rm -f /var/lib/dpkg/lock       #DOCS:
 sudo update-locale LANG=en_US.UTF-8 #DOCS:
+export APT_LISTCHANGES_FRONTEND=none #DOCS:
+export DEBIAN_FRONTEND=noninteractive #DOCS:
+
 #
 # *Note:* these installation instructions are also available in executable
 #         form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
@@ -15,8 +18,8 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 # Make sure all packages are are up-to-date by running:
 #
 
+    sudo apt-get -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" --force-yes -fuy install grub-pc #DOCS:
     sudo apt-get update -qq
-    sudo apt-get upgrade -y
 
 # Now you can install all packages needed for Nominatim:
 
@@ -28,13 +31,12 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
                             git
 
 # If you want to run the test suite, you need to install the following
-# aditional packages:
+# additional packages:
 
-    sudo apt-get install -y python-dev python-pip python-levenshtein python-shapely \
-                            python-psycopg2 tidy python-nose python-tidylib \
-                            phpunit
+    sudo apt-get install -y python3-dev python3-pip python3-psycopg2 python3-tidylib phpunit
 
-    pip install --user lettuce==0.2.18 six==1.7 haversine
+    pip3 install --user behave nose # urllib3
+    sudo pear install PHP_CodeSniffer
 
 #
 # System Configuration
@@ -81,7 +83,8 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 
 #
 # 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
+# for reading only:
 #
 
     sudo -u postgres createuser -s $USERNAME
@@ -99,6 +102,7 @@ sudo tee /etc/apache2/conf-available/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>
 
@@ -134,7 +138,7 @@ 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