From: Sarah Hoffmann Date: Tue, 2 Oct 2018 19:41:57 +0000 (+0200) Subject: Merge branch '201809-test-db' of https://github.com/mtmail/Nominatim into mtmail... X-Git-Tag: v3.3.0~85 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/fc6b08c8ab7c5e71f7af8f11b46b110935e0b713?hp=c73737f77fc70fa0838cd79a8f3736aba712b8fe Merge branch '201809-test-db' of https://github.com/mtmail/Nominatim into mtmail-201809-test-db --- diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index 062d7cee..4162f151 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -25,10 +25,10 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # Now you can install all packages needed for Nominatim: 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 libproj-dev \ postgresql-server-dev-10 postgresql-10-postgis-2.4 \ - postgresql-contrib-10 \ + postgresql-contrib-10 postgresql-10-postgis-scripts \ apache2 php php-pgsql libapache2-mod-php php-pear php-db \ php-intl git @@ -77,7 +77,7 @@ 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 +# `/etc/postgresql/10/main/postgresql.conf`. See section *Postgres Tuning* in # [the installation page](../admin/Installation.md#postgresql-tuning) # for the parameters to change. #