update vagrant scripts

This commit is contained in:
Sarah Hoffmann
2018-01-15 22:59:16 +01:00
parent b8f7563da9
commit 86833454a4
3 changed files with 19 additions and 16 deletions

View File

@@ -19,8 +19,7 @@ For compiling:
* a recent C++ compiler * a recent C++ compiler
Nominatim comes with its own version of osm2pgsql. See the Nominatim comes with its own version of osm2pgsql. See the
[osm2pgsql README](../osm2pgsql/README.md) for additional dependencies osm2pgsql README for additional dependencies required for compiling osm2pgsql.
required for compiling osm2pgsql.
For running tests: For running tests:

View File

@@ -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 \ php-pgsql php php-pear php-pear-DB php-intl libpqxx-devel \
bzip2-devel proj-devel geos-devel libxml2-devel boost-devel expat-devel zlib-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 # If you want to run the test suite, you need to install the following
# additional packages: # additional packages:
sudo yum install -y python-pip python-Levenshtein python-psycopg2 \ sudo yum install -y python34-pip python34-setuptools python34-devel \
python-numpy php-phpunit-PHPUnit php-phpunit-PHPUnit
pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \ pip3 install --user behave nose pytidylib psycopg2
haversine Shapely pytidylib
sudo pear install PHP_CodeSniffer sudo pear install PHP_CodeSniffer
# #
@@ -77,7 +78,8 @@
# #
# Next tune the postgresql configuration, which is located in # Next tune the postgresql configuration, which is located in
# `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* 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).

View File

@@ -25,8 +25,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \ sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\ libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
libbz2-dev libpq-dev libgeos-dev libgeos++-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 postgresql-contrib-9.5 \ 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 \ apache2 php php-pgsql libapache2-mod-php php-pear php-db \
php-intl git php-intl git
@@ -36,7 +37,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
sudo apt-get install -y python3-setuptools python3-dev python3-pip \ sudo apt-get install -y python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib phpunit php-cgi 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 # Tune the postgresql configuration, which is located in
# `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* 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).