hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
marc tobias
2022-11-03 23:29:58 +01:00
committed by Sarah Hoffmann
parent 6a5bbdfae0
commit 442e8fb411
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/admin/Deployment.md
View File

@@ -99,7 +99,7 @@ Unix socket instead, change the pool configuration
``` ini ``` ini
; Replace the tcp listener and add the unix socket ; 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 ; Ensure that the daemon runs as the correct user
listen.owner = www-data listen.owner = www-data
@@ -121,7 +121,7 @@ location @php {
fastcgi_param SCRIPT_FILENAME "$document_root$uri.php"; fastcgi_param SCRIPT_FILENAME "$document_root$uri.php";
fastcgi_param PATH_TRANSLATED "$document_root$uri.php"; fastcgi_param PATH_TRANSLATED "$document_root$uri.php";
fastcgi_param QUERY_STRING $args; 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; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
} }
@@ -131,7 +131,7 @@ location ~ [^/]\.php(/|$) {
if (!-f $document_root$fastcgi_script_name) { if (!-f $document_root$fastcgi_script_name) {
return 404; return 404;
} }
fastcgi_pass unix:/var/run/php-fpm.sock; fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;
fastcgi_index search.php; fastcgi_index search.php;
include fastcgi.conf; include fastcgi.conf;
} }

6
vagrant/Install-on-Ubuntu-18.sh
View File

@@ -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 sudo tee /etc/php/7.2/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF
[www] [www]
; Replace the tcp listener and add the unix socket ; 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 ; Ensure that the daemon runs as the correct user
listen.owner = www-data listen.owner = www-data
@@ -241,7 +241,7 @@ server {
fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php"; fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php";
fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php"; fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php";
fastcgi_param QUERY_STRING \$args; 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; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
} }
@@ -251,7 +251,7 @@ server {
if (!-f \$document_root\$fastcgi_script_name) { if (!-f \$document_root\$fastcgi_script_name) {
return 404; return 404;
} }
fastcgi_pass unix:/var/run/php7.2-fpm.sock; fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;
fastcgi_index search.php; fastcgi_index search.php;
include fastcgi.conf; include fastcgi.conf;
} }

10
vagrant/Install-on-Ubuntu-20.sh
View File

@@ -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 sudo tee /etc/php/7.4/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF
[www] [www]
; Replace the tcp listener and add the unix socket ; 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 ; Ensure that the daemon runs as the correct user
listen.owner = www-data listen.owner = www-data
@@ -232,7 +232,7 @@ server {
fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php"; fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php";
fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php"; fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php";
fastcgi_param QUERY_STRING \$args; 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; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
} }
@@ -242,7 +242,7 @@ server {
if (!-f \$document_root\$fastcgi_script_name) { if (!-f \$document_root\$fastcgi_script_name) {
return 404; return 404;
} }
fastcgi_pass unix:/var/run/php7.4-fpm.sock; fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;
fastcgi_index search.php; fastcgi_index search.php;
include fastcgi.conf; include fastcgi.conf;
} }
@@ -250,9 +250,9 @@ server {
EOF_NGINX_CONF EOF_NGINX_CONF
#DOCS:``` #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 # /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 # Enable the configuration and restart Nginx
# #

10
vagrant/Install-on-Ubuntu-22.sh
View File

@@ -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 sudo tee /etc/php/8.1/fpm/pool.d/www.conf << EOF_PHP_FPM_CONF
[www] [www]
; Replace the tcp listener and add the unix socket ; 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 ; Ensure that the daemon runs as the correct user
listen.owner = www-data listen.owner = www-data
@@ -232,7 +232,7 @@ server {
fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php"; fastcgi_param SCRIPT_FILENAME "\$document_root\$uri.php";
fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php"; fastcgi_param PATH_TRANSLATED "\$document_root\$uri.php";
fastcgi_param QUERY_STRING \$args; 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; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
} }
@@ -242,7 +242,7 @@ server {
if (!-f \$document_root\$fastcgi_script_name) { if (!-f \$document_root\$fastcgi_script_name) {
return 404; return 404;
} }
fastcgi_pass unix:/var/run/php7.4-fpm.sock; fastcgi_pass unix:/var/run/php-fpm-nominatim.sock;
fastcgi_index search.php; fastcgi_index search.php;
include fastcgi.conf; include fastcgi.conf;
} }
@@ -250,9 +250,9 @@ server {
EOF_NGINX_CONF EOF_NGINX_CONF
#DOCS:``` #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
# #