Skip to content

Commit 54d170e

Browse files
committed
Add apparmor_hat support to php::fpm::pool
1 parent 5df630b commit 54d170e

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

REFERENCE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,6 +2248,9 @@ documented here: http://php.net/manual/en/install.fpm.configuration.php.
22482248
[*group*]
22492249
The group that php-fpm should run as
22502250

2251+
[*apparmor_hat*]
2252+
The Apparmor hat to use
2253+
22512254
[*pm*]
22522255

22532256
[*pm_max_children*]

manifests/fpm/pool.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
# [*group*]
3131
# The group that php-fpm should run as
3232
#
33+
# [*apparmor_hat*]
34+
# The Apparmor hat to use
35+
#
3336
# [*pm*]
3437
#
3538
# [*pm_max_children*]
@@ -127,6 +130,7 @@
127130
$listen_mode = undef,
128131
$user = $php::fpm::config::user,
129132
$group = $php::fpm::config::group,
133+
$apparmor_hat = undef,
130134
$pm = 'dynamic',
131135
$pm_max_children = '50',
132136
$pm_start_servers = '5',

templates/fpm/pool.conf.erb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ listen.mode = <%= @listen_mode %>
4646
user = <%= @user %>
4747
; RPM: Keep a group allowed to write in log dir.
4848
group = <%= @group_final %>
49+
<% if @apparmor_hat -%>
50+
; Apparmor hat to change to
51+
apparmor_hat = <%= @apparmor_hat %>
52+
<% end -%>
4953

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

0 commit comments

Comments
 (0)