From c9b88165a8f50ec5a55f46d62fa4f716d49b48cf Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Thu, 23 Aug 2018 21:07:25 +0200 Subject: [PATCH] fix: remove phpfpm_group var --- README.md | 1 - defaults/main.yml | 1 - templates/pools.conf.j2 | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 5fe79e0..45bfbe8 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Install and configure PHP FPM See [php pool directives documentation](http://php.net/manual/en/install.fpm.configuration.php) -* `phpfpm_group` - (default: `www-data`) * `phpfpm_ping_path` - (default: `/ping`) * `phpfpm_ping_response` - (default: `pong`) * `phpfpm_pm` - (default: `ondemand`) diff --git a/defaults/main.yml b/defaults/main.yml index 690e99c..e5985d7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,4 @@ phpfpm_version: 7.0 -phpfpm_group: www-data phpfpm_dir: /etc/php/{{ phpfpm_version }}/fpm phpfpm_dir_log: /var/log/phpfpm phpfpm_packages: diff --git a/templates/pools.conf.j2 b/templates/pools.conf.j2 index 771c732..f4a88b7 100644 --- a/templates/pools.conf.j2 +++ b/templates/pools.conf.j2 @@ -8,7 +8,7 @@ group = users listen = /var/run/php{{ phpfpm_version }}-fpm-{{ pool.name }}.sock listen.owner = {{ pool.user }} -listen.group = {{ pool.group|default(phpfpm_group) }} +listen.group = {{ pool.group|default(pool.user) }} pm = {{ pool.pm|default(phpfpm_pm) }} pm.max_children = {{ pool.pm_max_children|default(phpfpm_pm_max_children) }}