gilex-dev
/
GisServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Replace legacy /var/run with /run, remove hardcoded php version

This commit is contained in:
gilex-dev 2024-06-08 12:48:04 +02:00
parent f183e4cd51
commit b183ddb51c
Signed by: gilex-dev
GPG Key ID: 9A2BEC7B5188D2E3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/nginx/lizmap.conf.j2
View File

@ -47,7 +47,7 @@ server {
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $path_info; fastcgi_param PATH_INFO $path_info;
fastcgi_param PATH_TRANSLATED $document_root$path_info; fastcgi_param PATH_TRANSLATED $document_root$path_info;
fastcgi_pass unix:/var/run/php/php8.2-fpm.sock; fastcgi_pass unix:/run/php/php{{ php['version'] }}-fpm.sock;
fastcgi_param SERVER_NAME $http_host; fastcgi_param SERVER_NAME $http_host;
} }
} }

6
templates/nginx/qgis-server.conf.j2
View File

@ -3,7 +3,7 @@
# Multi-Proces qgis # Multi-Proces qgis
upstream qgis-server_backend { upstream qgis-server_backend {
{% for item in range(1, qgis_server['count'] + 1, 1) %} {% for item in range(1, qgis_server['count'] + 1, 1) %}
server unix:/var/run/qgis-server-{{ item }}.sock; server unix:/run/qgis-server-{{ item }}.sock;
{% endfor %} {% endfor %}
} }
server { server {
@ -27,7 +27,7 @@ server {
include snippets/fastcgi-php.conf; include snippets/fastcgi-php.conf;
# #
# # With php-fpm (or other unix sockets): # # With php-fpm (or other unix sockets):
fastcgi_pass unix:/run/php/php8.2-fpm.sock; fastcgi_pass unix:/run/php/php{{ php['version'] }}-fpm.sock;
# # With php-cgi (or other tcp sockets): # # With php-cgi (or other tcp sockets):
# fastcgi_pass 127.0.0.1:9000; # fastcgi_pass 127.0.0.1:9000;
} }
@ -43,7 +43,7 @@ server {
#location /qgis-server { #location /qgis-server {
# gzip off; # gzip off;
# include fastcgi_params; # include fastcgi_params;
# fastcgi_pass unix:/var/run/qgisserver.socket; # fastcgi_pass unix:/run/qgisserver.socket;
#} #}
# Multi-Process qgis # Multi-Process qgis

2
templates/qgis-server@.socket.j2
View File

@ -5,7 +5,7 @@ Description=QGIS Server Listen Socket (instance %i)
[Socket] [Socket]
Accept=false Accept=false
ListenStream=/var/run/qgis-server-%i.sock ListenStream=/run/qgis-server-%i.sock
SocketUser={{ qgis_server['user'] }} SocketUser={{ qgis_server['user'] }}
SocketGroup={{ qgis_server['group'] }} SocketGroup={{ qgis_server['group'] }}
SocketMode=0600 SocketMode=0600