From 48dd3d156dde071cb94b2303df2e9f6e71db09b9 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Thu, 19 Nov 2020 15:25:49 +0100
Subject: [PATCH] Change the name of the upstream socket to avoid conflicts.

---
 templates/nginx_phpmyadmin.conf.j2 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/nginx_phpmyadmin.conf.j2 b/templates/nginx_phpmyadmin.conf.j2
index a5f43b1..4b046cd 100644
--- a/templates/nginx_phpmyadmin.conf.j2
+++ b/templates/nginx_phpmyadmin.conf.j2
@@ -1,4 +1,4 @@
-upstream php {
+upstream phpmyadmin {
 {% if phpmyadmin_phpfpm_listen_on_socket %}
         server unix:{{ item.listen }};
 {% else %}
@@ -127,12 +127,16 @@ server {
                 # 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
                 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$ {
                 include fastcgi.conf;
                 fastcgi_intercept_errors on;
-                fastcgi_pass php;
+                fastcgi_pass phpmyadmin;
         }
 
         location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {