Merge remote-tracking branch 'upstream/master'

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

diff --git a/vagrant/Install-on-Ubuntu-18-nginx.sh b/vagrant/Install-on-Ubuntu-18-nginx.sh
index fdd7c469f6b93450670bc79d630236fea64946eb..382df6b2448ba526986763d94756cf1bde30d84d 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-18-nginx.sh
+++ b/vagrant/Install-on-Ubuntu-18-nginx.sh
@@ -18,12 +18,13 @@ export DEBIAN_FRONTEND=noninteractive
 
     sudo apt-get update -qq
     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\
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-10 postgresql-10-postgis-2.4 \
                             postgresql-contrib-10 \
-                            nginx php-fpm php php-pgsql php-pear php-db \
-                            php-intl git
+                            nginx php-fpm php php-pgsql \
+                            php-intl python3-setuptools python3-dev python3-pip \
+                            python3-psycopg2 python3-tidylib git
 
     export USERNAME=vagrant
     export USERHOME=/home/vagrant
@@ -97,7 +98,7 @@ server {
         if (!-f \$document_root\$fastcgi_script_name) {
             return 404;
         }
-        fastcgi_pass unix:/var/run/php7.2-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
         fastcgi_index search.php;
         include fastcgi.conf;
     }