X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c4d424b1003ab200409e7f235a73650e7bd1f0b..521d6294993f8d8d46d93d514c08556d0c924786:/vagrant-provision.sh

diff --git a/vagrant-provision.sh b/vagrant-provision.sh
index aad75443..3fae5b68 100755
--- a/vagrant-provision.sh
+++ b/vagrant-provision.sh
@@ -29,10 +29,9 @@ USERNAME=vagrant
 
 sudo apt-get update -qq
 sudo apt-get upgrade -y
-# sudo apt-get install -y git-core screen
 sudo apt-get install -y build-essential libxml2-dev libgeos-dev libpq-dev libbz2-dev \
                         libtool automake libproj-dev libboost-dev  libboost-system-dev \
-                        libboost-filesystem-dev libboost-thread-dev
+                        libboost-filesystem-dev libboost-thread-dev libexpat-dev
 sudo apt-get autoremove -y
 
 # get arrow-keys working in terminal (e.g. editing in vi)
@@ -62,8 +61,7 @@ sudo -u postgres createuser -s $USERNAME
 ###
 ### PHP for frontend
 ###
-sudo apt-get install -y php5 php5-pgsql php-pear 
-sudo pear install DB
+sudo apt-get install -y php5 php5-pgsql php-pear php-db
 
 
 # get rid of some warning
@@ -84,8 +82,6 @@ sudo apt-get install -y libprotobuf-c0-dev protobuf-c-compiler \
 
 # now ideally login as $USERNAME and continue
 su $USERNAME -l
-pwd
-ls -la /home/vagrant
 cd /home/vagrant/Nominatim
 
 # cd ~/Nominatim
@@ -96,6 +92,12 @@ chmod +x ./
 chmod +x ./module
 
 
+LOCALSETTINGS_FILE='settings/local.php'
+if [[ -e "$LOCALSETTINGS_FILE" ]]; then
+  echo "$LOCALSETTINGS_FILE already exist, writing to settings/local-vagrant.php instead."
+  LOCALSETTINGS_FILE='settings/local-vagrant.php'
+fi
+
 # IP=`curl -s http://bot.whatismyipaddress.com`
 IP=localhost
 echo "<?php
@@ -106,7 +108,7 @@ echo "<?php
    @define('CONST_Postgis_Version', '2.1');
    // Website settings
    @define('CONST_Website_BaseURL', 'http://$IP:8089/nominatim/');
-" > settings/local.php
+" > $LOCALSETTINGS_FILE
 
 
 
@@ -118,7 +120,7 @@ echo "<?php
 ### Setup Apache/website
 ###
 
-createuser -SDR www-data
+sudo -u postgres createuser -SDR www-data
 
 echo '
 Listen 8089
@@ -152,15 +154,12 @@ sudo chown $USERNAME /var/www/nominatim
 ## Test suite (Python)
 ## https://github.com/twain47/Nominatim/tree/master/tests
 ##
-sudo apt-get install -y python-dev python-pip python-Levenshtein tidy
-sudo pip install lettuce nose pytidylib haversine psycopg2 shapely
+sudo apt-get install -y python-dev python-pip python-Levenshtein python-shapely \
+                        python-psycopg2 tidy python-nose python-tidylib
+sudo pip install lettuce==0.2.18 six==1.7 haversine
 
-##
 ## Test suite (PHP)
 ## https://github.com/twain47/Nominatim/tree/master/tests-php
-##
-wget --no-clobber -q https://phar.phpunit.de/phpunit.phar
-chmod +x phpunit.phar
-sudo mv phpunit.phar /usr/local/bin/phpunit
+sudo apt-get install -y phpunit