update vagrant scripts

diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md
index fbdff93e68896469d1f3ddc692b6c8a2cfa540b9..ce7fb412fff8ab69d333a8501e2d488d7c8797f6 100644 (file)
--- a/docs/admin/Installation.md
+++ b/docs/admin/Installation.md
@@ -19,8 +19,7 @@ For compiling:
   * a recent C++ compiler
 
 Nominatim comes with its own version of osm2pgsql. See the
   * a recent C++ compiler
 
 Nominatim comes with its own version of osm2pgsql. See the

-[osm2pgsql README](../osm2pgsql/README.md) for additional dependencies
-required for compiling osm2pgsql.
+osm2pgsql README for additional dependencies required for compiling osm2pgsql.

 
 For running tests:
 
 
 For running tests:
 

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index 6c41b70c83bd307ff232872863821f3af3c109c8..8d7a78fbee415ee582bd66a16b67a492925ba46b 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -19,18 +19,19 @@
 
 # Now you can install all packages needed for Nominatim:
 
 
 # Now you can install all packages needed for Nominatim:
 

-    sudo yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
+    sudo yum install -y postgresql-server postgresql-contrib postgresql-devel \
+                        postgis postgis-utils \

                         git cmake make gcc gcc-c++ libtool policycoreutils-python \
                         git cmake make gcc gcc-c++ libtool policycoreutils-python \

-                        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
+                        php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel \
+                        proj-epsg bzip2-devel proj-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:
 
 
 # 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 yum install -y python34-pip python34-setuptools python34-devel \
+                        php-phpunit-PHPUnit
+    pip3 install --user behave nose pytidylib psycopg2

     sudo pear install PHP_CodeSniffer
 
 #
     sudo pear install PHP_CodeSniffer
 
 #


@@ -77,7 +78,8 @@
 #
 # Next tune the postgresql configuration, which is located in 
 # `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in
 #
 # Next tune the postgresql configuration, which is located in 
 # `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in

-# [the installation page](Installation.md) for the parameters to change.
+# [the installation page](../admin/Installation.md#postgresql-tuning)
+# 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.
 


@@ -180,4 +182,4 @@ EOF
 
 
 # Nominatim is now ready to use. Continue with
 
 
 # Nominatim is now ready to use. Continue with

-# [importing a database from OSM data](Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import-and-Update.md).

diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh
index aee7a3bf5ed397b5e265877b76d9da49321dd1bc..7547e6cf67e70ae66a91fefd552a34c68252a89d 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-16.sh
+++ b/vagrant/Install-on-Ubuntu-16.sh
@@ -25,8 +25,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
 
     sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\

-                            libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev \
-                            postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 postgresql-contrib-9.5 \
+                            libbz2-dev libpq-dev libproj-dev \
+                            postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \
+                            postgresql-contrib-9.5 \

                             apache2 php php-pgsql libapache2-mod-php php-pear php-db \
                             php-intl git
 
                             apache2 php php-pgsql libapache2-mod-php php-pear php-db \
                             php-intl git
 


@@ -36,7 +37,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
     sudo apt-get install -y python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib phpunit php-cgi
 
     sudo apt-get install -y python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib phpunit php-cgi
 

-    pip3 install --user behave nose # urllib3
+    pip3 install --user behave nose

     sudo pear install PHP_CodeSniffer
 
 #
     sudo pear install PHP_CodeSniffer
 
 #


@@ -76,7 +77,8 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 # Tune the postgresql configuration, which is located in 
 # `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* in
 #
 # Tune the postgresql configuration, which is located in 
 # `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* in

-# [the installation page](Installation.md) for the parameters to change.
+# [the installation page](../admin/Installation.md#postgresql-tuning)
+# for the parameters to change.

 #
 # Restart the postgresql service after updating this config file.
 
 #
 # Restart the postgresql service after updating this config file.
 


@@ -167,4 +169,4 @@ EOF
 
 
 # Nominatim is now ready to use. Continue with
 
 
 # Nominatim is now ready to use. Continue with

-# [importing a database from OSM data](Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import-and-Update.md).