From 33c805aee0f8d3998ad68fcc3908dd85137a0ea9 Mon Sep 17 00:00:00 2001 From: marc tobias Date: Thu, 3 Nov 2022 23:29:58 +0100 Subject: [PATCH] Install scripts: remove version from /var/run/php-fpm filenames --- docs/admin/Deployment.md | 6 +++--- vagrant/Install-on-Ubuntu-18.sh | 6 +++--- vagrant/Install-on-Ubuntu-20.sh | 10 +++++----- vagrant/Install-on-Ubuntu-22.sh | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/admin/Deployment.md b/docs/admin/Deployment.md index 5dcbcde9..8b635546 100644 --- a/docs/admin/Deployment.md +++ b/docs/admin/Deployment.md @@ -99,7 +99,7 @@ Unix socket instead, change the pool configuration ``` ini ; Replace the tcp listener and add the unix socket -listen = /var/run/php-fpm.sock +listen = /var/run/php-fpm-nominatim.sock ; Ensure that the daemon runs as the correct user listen.owner = www-data @@ -121,7 +121,7 @@ location @php { 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/php-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index index.php; include fastcgi_params; } @@ -131,7 +131,7 @@ location ~ [^/]\.php(/|$) { if (!-f $document_root$fastcgi_script_name) { return 404; } - fastcgi_pass unix:/var/run/php-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index search.php; include fastcgi.conf; } diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index e36086e1..53284ea8 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -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 -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 @@ -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_pass unix:/var/run/php7.2-fpm.sock; + fastcgi_pass unix:/var/run/php-fpm-nominatim.sock; fastcgi_index index.php; include fastcgi_params; } @@ -251,7 +251,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-fpm-nominatim.sock; fastcgi_index search.php; include fastcgi.conf; } diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index d364cccd..a8654490 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -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 # diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index 419a7313..a7ba6866 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -197,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 -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 @@ -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/php8.1-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 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 -# to /var/run/php/php8.1-fpm.sock. +# to /var/run/php/php-fpm-nominatim.sock. # # Enable the configuration and restart Nginx # -- 2.45.1