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 e077989fb41251738028dc5a38be888b612676d8..137085a1437b8a46c3f97ae5bae35780468e2d36 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:
 # 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.
 #
 # *Note:* these installation instructions are also available in executable
 #         form for use with vagrant under vagrant/install-on-ubuntu-16.sh.


@@ -16,7 +19,7 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 #
 
     sudo apt-get update -qq
 #
 
     sudo apt-get update -qq

-    sudo apt-get upgrade -y
+    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:
 
 
 # Now you can install all packages needed for Nominatim:
 


@@ -35,6 +38,7 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
                             python-numpy phpunit
 
     pip install --user lettuce==0.2.18 six==1.7 haversine
                             python-numpy phpunit
 
     pip install --user lettuce==0.2.18 six==1.7 haversine

+    sudo pear install PHP_CodeSniffer

 
 #
 # System Configuration
 
 #
 # System Configuration


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