From e25ebe5f801c3d81a0e3ac60e58c0ffc56448109 Mon Sep 17 00:00:00 2001 From: Kilian Engelhardt Date: Wed, 21 Oct 2020 14:02:59 +0200 Subject: [PATCH 1/4] (#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 From 6db46a05b1a118ec772950361671b14391d24dcb Mon Sep 17 00:00:00 2001 From: Kilian Engelhardt Date: Wed, 28 Apr 2021 22:36:19 +0200 Subject: [PATCH 2/4] add description to 'listen_acl_users' parameter Description copied from php-fpm configuration documentation at: https://www.php.net/manual/en/install.fpm.configuration.php --- manifests/fpm/pool.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index cc5f558f..72a3a7a0 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -25,6 +25,9 @@ # [*listen_mode*] # # [*listen_acl_users*] +# When POSIX Access Control Lists are supported you can set them using this option. +# When set, listen.owner and listen.group are ignored. Value is a comma separated +# list of user names. # # [*user*] # The user that php-fpm should run as From e42458d9f1a63964d03b4b76fc07e23dfc9e0d85 Mon Sep 17 00:00:00 2001 From: Kilian Engelhardt Date: Wed, 28 Apr 2021 22:39:55 +0200 Subject: [PATCH 3/4] (#607) add 'listen.acl_groups' to defined type add 'listen.acl_groups' to pool template --- manifests/fpm/pool.pp | 4 ++++ templates/fpm/pool.conf.erb | 3 +++ 2 files changed, 7 insertions(+) diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index 72a3a7a0..54a23b1e 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -29,6 +29,9 @@ # When set, listen.owner and listen.group are ignored. Value is a comma separated # list of user names. # +# [*listen_acl_groups*] +# See listen_acl_users. Value is a comma separated list of group names. +# # [*user*] # The user that php-fpm should run as # @@ -134,6 +137,7 @@ $listen_group = undef, $listen_mode = undef, $listen_acl_users = undef, + $listen_acl_groups = 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 5fadc4b6..8c25dfd7 100644 --- a/templates/fpm/pool.conf.erb +++ b/templates/fpm/pool.conf.erb @@ -41,6 +41,9 @@ listen.mode = <%= @listen_mode %> <% if @listen_acl_users -%> listen.acl_users = <%= @listen_acl_users %> <% end -%> +<% if @listen_acl_groups -%> +listen.acl_groups = <%= @listen_acl_groups %> +<% end -%> ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group From 911fb380c4e8ca6d3078be03ce63d97d0458d2a7 Mon Sep 17 00:00:00 2001 From: Kilian Engelhardt Date: Wed, 28 Apr 2021 22:43:28 +0200 Subject: [PATCH 4/4] add datatype to 'listen.?' parameters --- manifests/fpm/pool.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index 54a23b1e..8ca3fa6b 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -136,8 +136,8 @@ $listen_owner = undef, $listen_group = undef, $listen_mode = undef, - $listen_acl_users = undef, - $listen_acl_groups = undef, + Optional[String[1]] $listen_acl_users = undef, + Optional[String[1]] $listen_acl_groups = undef, $user = $php::fpm::config::user, $group = $php::fpm::config::group, Optional[String[1]] $apparmor_hat = undef,