Update Vagrantfile

[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 3537bcf4486c0050298cb4afe2499a91c318907a..621e4473be572d4020a030e086a00323e70a4463 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18.sh
+++ b/vagrant/Install-on-Ubuntu-18.sh
@@ -24,10 +24,10 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
     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 php-cgi
     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 \
+                        libbz2-dev libpq-dev liblua5.3-dev lua5.3\

                         postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \
                         postgresql-10-postgis-2.4 \
                         postgresql-contrib-10 postgresql-10-postgis-scripts \

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

                         python3-psutil python3-jinja2 python3-yaml python3-icu git
 
 # Some of the Python packages that come with Ubuntu 18.04 are too old, so
                         python3-psutil python3-jinja2 python3-yaml python3-icu git
 
 # Some of the Python packages that come with Ubuntu 18.04 are too old, so


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

-listen = /var/run/php7.2-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


@@ -241,7 +241,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/php7.2-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;
     }


@@ -251,7 +251,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.2-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;
     }