ISTI-ansible-roles
/
ansible-role-phpmyadmin
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the name of the upstream socket to avoid conflicts.

This commit is contained in:
Andrea Dell'Amico 2020-11-19 15:25:49 +01:00
parent d6f7220715
commit 48dd3d156d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/nginx_phpmyadmin.conf.j2
View File

@ -1,4 +1,4 @@
upstream php { upstream phpmyadmin {
{% if phpmyadmin_phpfpm_listen_on_socket %} {% if phpmyadmin_phpfpm_listen_on_socket %}
server unix:{{ item.listen }}; server unix:{{ item.listen }};
{% else %} {% else %}
@ -127,12 +127,16 @@ server {
# This is cool because no php is touched for static content. # This is cool because no php is touched for static content.
# include the "?$args" part so non-default permalinks doesn't break when using query string # include the "?$args" part so non-default permalinks doesn't break when using query string
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
{% for acl in phpmyadmin_nginx_acls %}
{{ acl.action }} {{ acl.cidr }};
{% endfor %}
{{ phpmyadmin_nginx_acl_default }} all;
} }
location ~ \.php$ { location ~ \.php$ {
include fastcgi.conf; include fastcgi.conf;
fastcgi_intercept_errors on; fastcgi_intercept_errors on;
fastcgi_pass php; fastcgi_pass phpmyadmin;
} }
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ { location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {