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

kengelhardt-godaddy · kengelhardt-godaddy · commit 94cf69152ab3 · 2020-12-01T18:41:13.000+01:00
add 'listen.acl_users' to pool template
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`#`
`25`	`25`	`# [listen_mode]`
`26`	`26`	`#`
	`27`	`+# [listen_acl_users]`
	`28`	`+#`
`27`	`29`	`# [user]`
`28`	`30`	`# The user that php-fpm should run as`
`29`	`31`	`#`
`@@ -128,6 +130,7 @@`
`128`	`130`	`$listen_owner = undef,`
`129`	`131`	`$listen_group = undef,`
`130`	`132`	`$listen_mode = undef,`
	`133`	`+ $listen_acl_users = undef,`
`131`	`134`	`$user = $php::fpm::config::user,`
`132`	`135`	`$group = $php::fpm::config::group,`
`133`	`136`	`Optional[String[1]] $apparmor_hat = undef,`