From 94cf69152ab385ca1e85ea161916181af3be8c28 Mon Sep 17 00:00:00 2001 From: Kilian Engelhardt Date: Wed, 21 Oct 2020 14:02:59 +0200 Subject: [PATCH] (#607) add 'listen.acl_users' to defined type add 'listen.acl_users' to pool template --- manifests/fpm/pool.pp | 3 +++ templates/fpm/pool.conf.erb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index 67ac5751..cc5f558f 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -24,6 +24,8 @@ # # [*listen_mode*] # +# [*listen_acl_users*] +# # [*user*] # The user that php-fpm should run as # @@ -128,6 +130,7 @@ $listen_owner = undef, $listen_group = undef, $listen_mode = undef, + $listen_acl_users = undef, $user = $php::fpm::config::user, $group = $php::fpm::config::group, Optional[String[1]] $apparmor_hat = undef, diff --git a/templates/fpm/pool.conf.erb b/templates/fpm/pool.conf.erb index 99981d19..5fadc4b6 100644 --- a/templates/fpm/pool.conf.erb +++ b/templates/fpm/pool.conf.erb @@ -38,6 +38,9 @@ listen.mode = <%= @listen_mode %> <% else -%> ;listen.mode = 0660 <% end -%> +<% if @listen_acl_users -%> +listen.acl_users = <%= @listen_acl_users %> +<% end -%> ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group