Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#607) add 'listen.acl_users' to defined type #611

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

(#607) add 'listen.acl_users' to defined type #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e25ebe5
(#607) add 'listen.acl_users' to defined type
kengelhardt-godaddy Oct 21, 2020
6db46a0
add description to 'listen_acl_users' parameter
kengelhardt-godaddy Apr 28, 2021
e42458d
(#607) add 'listen.acl_groups' to defined type
kengelhardt-godaddy Apr 28, 2021
911fb38
add datatype to 'listen.?' parameters
kengelhardt-godaddy Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions manifests/fpm/pool.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
#
# [*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.
#
# [*listen_acl_groups*]
# See listen_acl_users. Value is a comma separated list of group names.
#
kBite marked this conversation as resolved.
Show resolved Hide resolved
# [*user*]
# The user that php-fpm should run as
#
Expand Down Expand Up @@ -128,6 +136,8 @@
$listen_owner = undef,
$listen_group = undef,
$listen_mode = 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,
Expand Down
6 changes: 6 additions & 0 deletions templates/fpm/pool.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ listen.mode = <%= @listen_mode %>
<% else -%>
;listen.mode = 0660
<% end -%>
<% 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
Expand Down