refactor custom php_fpm_listen integration

Author: alexandermeindl

roles/matomo/tasks/setup_nginx.yml

@@ -29,7 +29,7 @@
     dest: /etc/nginx/sites-available/matomo.conf
     mode: '0644'
   vars:
-    php_fpm_custom_listen: '{{ matomo_php_fpm_listen_name if matomo_php_fpm_listen_name is defined else php_fpm_listen }}'
+    php_fpm_custom_listen: "{{ php_fpm_base + '-' + matomo_php_fpm_pool + '.sock' if matomo_php_fpm_pool is defined else php_fpm_listen }}"
   notify: Reload nginx
 
 - name: Ensure matomo vhost is enabled

roles/php_fpm/defaults/main.yml

@@ -6,7 +6,8 @@ php_fpm_pools:
   - name: www
     user: '{{ nginx_user }}'
     group: '{{ nginx_group }}'
-    listen_name: '{{ php_fpm_listen }}'
+    # this is default (you can skip pool, if it is www)
+    pool: www
     skip_user_create: true
 
 php_fpm_listen_allowed_clients: 127.0.0.1

roles/php_fpm/tasks/pool.yml

@@ -25,3 +25,5 @@
     owner: root
     group: root
   notify: Restart php-fpm
+  vars:
+    active_php_fpm_listen: "{{ php_fpm_base + '-' + pool.pool + '.sock' if instance is defined and pool.pool is defined and pool.pool != 'www' else php_fpm_listen }}"

roles/php_fpm/templates/pool.j2

@@ -34,7 +34,7 @@ group = {{ pool.group | default(pool.user) | default(pool.name) }}
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = {{ pool.listen_name if pool.listen_name is defined else php_fpm_listen }}
+listen = {{ active_php_fpm_listen }}
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)