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 a466c514f67a1b5a2823eb8f8f08a6e7353f34ca..137085a1437b8a46c3f97ae5bae35780468e2d36 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 
     sudo apt-get update -qq
-    sudo apt-get -o Dpkg::Options::="--force-confnew" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
+    sudo apt-get -o Dpkg::Options::="--force-confold" --force-yes -fuy dist-upgrade #DOCS:    sudo apt-get upgrade
 
 # Now you can install all packages needed for Nominatim:
 
@@ -38,6 +38,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                             python-numpy phpunit
 
     pip install --user lettuce==0.2.18 six==1.7 haversine
+    sudo pear install PHP_CodeSniffer
 
 #
 # System Configuration
@@ -103,6 +104,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>