X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5e477e3b5b99da6fc4e54749d4671a6fc8fdcd66..fd3dec8efebd202352f20cbfebb36d955e0198c4:/vagrant/Install-on-Ubuntu-20.sh diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index d364cccd..87aad5ef 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -23,7 +23,7 @@ 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 \ - libbz2-dev libpq-dev \ + libbz2-dev libpq-dev liblua5.3-dev lua5.3 \ postgresql-12-postgis-3 \ postgresql-contrib-12 postgresql-12-postgis-3-scripts \ php-cli php-pgsql php-intl libicu-dev python3-dotenv \ @@ -197,7 +197,7 @@ if [ "x$2" == "xinstall-nginx" ]; then #DOCS: sudo tee /etc/php/7.4/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF [www] ; Replace the tcp listener and add the unix socket -listen = /var/run/php7.4-fpm.sock +listen = /var/run/php-fpm-nominatim.sock ; Ensure that the daemon runs as the correct user listen.owner = www-data @@ -232,7 +232,7 @@ server { 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.4-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index index.php; include fastcgi_params; } @@ -242,7 +242,7 @@ server { 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; } @@ -250,9 +250,9 @@ server { EOF_NGINX_CONF #DOCS:``` -# If you have some errors, make sure that php7.4-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 -# to /var/run/php/php7.4-fpm.sock. +# to /var/run/php/php-fpm-nominatim.sock. # # Enable the configuration and restart Nginx #