convert sqlite: add index on parent_place_id

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

diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh
index dbb70ffe6546ab9db484f2d22d9f2145ae044cc0..174b8a771ab8ef95d277850c8699c7476ee9f48a 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-22.sh
+++ b/vagrant/Install-on-Ubuntu-22.sh
@@ -20,15 +20,15 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 
 # Now you can install all packages needed for Nominatim:
 
 
 # Now you can install all packages needed for Nominatim:
 

-    sudo apt install -y php-cgi

     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \
     sudo apt install -y build-essential cmake g++ libboost-dev libboost-system-dev \
                         libboost-filesystem-dev libexpat1-dev zlib1g-dev \

-                        libbz2-dev libpq-dev libproj-dev \
-                        postgresql-server-dev-14 postgresql-14-postgis-3 \
+                        libbz2-dev libpq-dev liblua5.3-dev lua5.3 lua-dkjson \
+                        nlohmann-json3-dev postgresql-14-postgis-3 \

                         postgresql-contrib-14 postgresql-14-postgis-3-scripts \
                         postgresql-contrib-14 postgresql-14-postgis-3-scripts \

-                        php php-pgsql php-intl libicu-dev python3-dotenv \
+                        php-cli php-pgsql php-intl libicu-dev python3-dotenv \

                         python3-psycopg2 python3-psutil python3-jinja2 \
                         python3-psycopg2 python3-psutil python3-jinja2 \

-                        python3-icu python3-datrie git
+                        python3-icu python3-datrie python3-sqlalchemy \
+                        python3-asyncpg python3-yaml git

 
 #
 # System Configuration
 
 #
 # System Configuration


@@ -50,6 +50,11 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 # You may find a more suitable location if you wish.
 #
 #
 # You may find a more suitable location if you wish.
 #

+# The following instructions assume you are logged in as this user.
+# You can also switch to the user with:
+#
+#     sudo -u nominatim bash
+#

 # To be able to copy and paste instructions from this manual, export
 # user name and home directory now like this:
 #
 # To be able to copy and paste instructions from this manual, export
 # user name and home directory now like this:
 #


@@ -68,8 +73,8 @@ fi                                 #DOCS:
 # ---------------------
 #
 # Tune the postgresql configuration, which is located in 
 # ---------------------
 #
 # Tune the postgresql configuration, which is located in 

-# `/etc/postgresql/14/main/postgresql.conf`. See section *Postgres Tuning* in
-# [the installation page](../admin/Installation.md#postgresql-tuning)
+# `/etc/postgresql/14/main/postgresql.conf`. See section *Tuning the PostgreSQL database*
+# in [the installation page](../admin/Installation.md#tuning-the-postgresql-database)

 # for the parameters to change.
 #
 # Restart the postgresql service after updating this config file.
 # for the parameters to change.
 #
 # Restart the postgresql service after updating this config file.


@@ -109,7 +114,7 @@ fi                                 #DOCS:
 # download the country grid:
 
 if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh
 # download the country grid:
 
 if [ ! -f data/country_osm_grid.sql.gz ]; then       #DOCS:    :::sh

-    wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
+    wget -O data/country_osm_grid.sql.gz https://nominatim.org/data/country_grid.sql.gz

 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,
 fi                                 #DOCS:
 
 # The code must be built in a separate directory. Create this directory,


@@ -197,7 +202,7 @@ if [ "x$2" == "xinstall-nginx" ]; then #DOCS:
 sudo tee /etc/php/8.1/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF
 [www]
 ; Replace the tcp listener and add the unix socket
 sudo tee /etc/php/8.1/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF
 [www]
 ; Replace the tcp listener and add the unix socket

-listen = /var/run/php8.1-fpm.sock
+listen = /var/run/php-fpm-nominatim.sock

 
 ; Ensure that the daemon runs as the correct user
 listen.owner = www-data
 
 ; Ensure that the daemon runs as the correct user
 listen.owner = www-data


@@ -232,7 +237,7 @@ server {
         fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php";
         fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php";
         fastcgi_param QUERY_STRING    \$args;
         fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php";
         fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php";
         fastcgi_param QUERY_STRING    \$args;

-        fastcgi_pass unix:/var/run/php8.1-fpm.sock;
+        fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;

         fastcgi_index index.php;
         include fastcgi_params;
     }
         fastcgi_index index.php;
         include fastcgi_params;
     }


@@ -242,7 +247,7 @@ server {
         if (!-f \$document_root\$fastcgi_script_name) {
             return 404;
         }
         if (!-f \$document_root\$fastcgi_script_name) {
             return 404;
         }

-        fastcgi_pass unix:/var/run/php7.4-fpm.sock;
+        fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;

         fastcgi_index search.php;
         include fastcgi.conf;
     }
         fastcgi_index search.php;
         include fastcgi.conf;
     }


@@ -250,9 +255,9 @@ server {
 EOF_NGINX_CONF
 #DOCS:```
 
 EOF_NGINX_CONF
 #DOCS:```
 

-# If you have some errors, make sure that php8.1-fpm.sock is well under
+# If you have some errors, make sure that php-fpm-nominatim.sock is well under

 # /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration
 # /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration

-# to /var/run/php/php8.1-fpm.sock.
+# to /var/run/php/php-fpm-nominatim.sock.

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