Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / Install-on-Ubuntu-18.sh

diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh
index eb1bdc82409e63bcdca9154402a116e501a39360..dadce0865847dfd0540cd5f5a958b1c0822d1cda 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -29,13 +29,13 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \
                         libbz2-dev libpq-dev libproj-dev \
                         postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \

-                        php php-pgsql php-intl python3-pip \
-                        python3-psycopg2 python3-psutil python3-jinja2 git libicu-dev
+                        php php-pgsql php-intl libicu-dev python3-pip \
+                        python3-psycopg2 python3-psutil python3-jinja2 python3-icu git

 
 

-# The python-dotenv package that comes with Ubuntu 18.04 is too old, so
+# Some of the Python packages that come with Ubuntu 18.04 are too old, so

 # install the latest version from pip:
 
 # install the latest version from pip:
 

-    pip3 install python-dotenv PyICU
+    pip3 install python-dotenv datrie pyyaml

 
 #
 # System Configuration
 
 #
 # System Configuration


@@ -132,7 +132,7 @@ fi                                 #DOCS:
 # ======================
 #
 # The webserver should serve the php scripts from the website directory of your
 # ======================
 #
 # The webserver should serve the php scripts from the website directory of your

-# [project directory](../admin/import.md#creating-the-project-directory).
+# [project directory](../admin/Import.md#creating-the-project-directory).

 # Therefore set up a project directory and populate the website directory:
 
     mkdir $USERHOME/nominatim-project
 # Therefore set up a project directory and populate the website directory:
 
     mkdir $USERHOME/nominatim-project