Skip to content

Commit

Permalink
Add apparmor_hat support to php::fpm::pool
Browse files Browse the repository at this point in the history
  • Loading branch information
simondeziel committed Aug 31, 2020
1 parent 5df630b commit 54d170e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2248,6 +2248,9 @@ documented here: http://php.net/manual/en/install.fpm.configuration.php.
[*group*]
The group that php-fpm should run as

[*apparmor_hat*]
The Apparmor hat to use

[*pm*]

[*pm_max_children*]
Expand Down
4 changes: 4 additions & 0 deletions manifests/fpm/pool.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
# [*group*]
# The group that php-fpm should run as
#
# [*apparmor_hat*]
# The Apparmor hat to use
#
# [*pm*]
#
# [*pm_max_children*]
Expand Down Expand Up @@ -127,6 +130,7 @@
$listen_mode = undef,
$user = $php::fpm::config::user,
$group = $php::fpm::config::group,
$apparmor_hat = undef,
$pm = 'dynamic',
$pm_max_children = '50',
$pm_start_servers = '5',
Expand Down
4 changes: 4 additions & 0 deletions templates/fpm/pool.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ listen.mode = <%= @listen_mode %>
user = <%= @user %>
; RPM: Keep a group allowed to write in log dir.
group = <%= @group_final %>
<% if @apparmor_hat -%>
; Apparmor hat to change to
apparmor_hat = <%= @apparmor_hat %>
<% end -%>

; Choose how the process manager will control the number of child processes.
; Possible Values:
Expand Down

0 comments on commit 54d170e

Please sign in to comment.