Install scripts: remove version from /var/run/php-fpm filenames

[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 b86f1f65f76e06dbe18e59586297586b42c73f1c..a7ba6866543c018b26b6cae52e6ddc8731b4a75e 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-22.sh
+++ b/vagrant/Install-on-Ubuntu-22.sh
@@ -23,12 +23,11 @@ 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 \

                         postgresql-server-dev-14 postgresql-14-postgis-3 \
                         postgresql-contrib-14 postgresql-14-postgis-3-scripts \
                         postgresql-server-dev-14 postgresql-14-postgis-3 \
                         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-typing-extensions \

                         python3-icu python3-datrie git
 
 #
                         python3-icu python3-datrie git
 
 #


@@ -198,7 +197,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


@@ -233,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_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;
     }


@@ -243,7 +242,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;
     }


@@ -251,9 +250,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
 #