merge marking rare name with adding name token

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

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index 292947d179ec91ecd12a265e852c98be5711a215..bbad7a576dcc8bccd3a1f1b0c55dd5f4e13783b3 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -33,8 +33,8 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                         postgresql-server-dev-12 postgresql-12-postgis-3 \
                         postgresql-contrib-12 postgresql-12-postgis-3-scripts \
                         php php-pgsql php-intl libicu-dev python3-dotenv \
                         postgresql-server-dev-12 postgresql-12-postgis-3 \
                         postgresql-contrib-12 postgresql-12-postgis-3-scripts \
                         php php-pgsql php-intl libicu-dev python3-dotenv \

-                        python3-psycopg2 python3-psutil python3-jinja2 python3-icu git \
-                        python3-argparse-manpage
+                        python3-psycopg2 python3-psutil python3-jinja2 \
+                        python3-icu python3-datrie git

 
 #
 # System Configuration
 
 #
 # System Configuration


@@ -130,7 +130,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


@@ -245,6 +245,9 @@ server {
 EOF_NGINX_CONF
 #DOCS:```
 
 EOF_NGINX_CONF
 #DOCS:```
 

+# If you have some errors, make sure that php7.4-fpm.sock is well under
+# /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration
+# to /var/run/php/php7.4-fpm.sock.

 #
 # Enable the configuration and restart Nginx
 #
 #
 # Enable the configuration and restart Nginx
 #