Skip to content

Commit 8b99069

Browse files
committed
add pool_purge option to init.pp
1 parent d1c094f commit 8b99069

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

manifests/fpm.pp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
# Hash of defaults params php::fpm::pool resources that will be created.
5050
# Defaults is empty hash.
5151
#
52+
# [*pool_purge*]
53+
# Whether to purge pool config files not created
54+
# by this module
55+
#
5256
class php::fpm (
5357
String $ensure = $php::ensure,
5458
$user = $php::fpm_user,
@@ -64,6 +68,7 @@
6468
Hash $pools = $php::real_fpm_pools,
6569
$log_owner = $php::log_owner,
6670
$log_group = $php::log_group,
71+
Boolean $pool_purge = $php::pool_purge,
6772
) {
6873

6974
if ! defined(Class['php']) {
@@ -85,13 +90,14 @@
8590
}
8691

8792
class { 'php::fpm::config':
88-
user => $user,
89-
group => $group,
90-
inifile => $inifile,
91-
settings => $real_settings,
92-
log_owner => $log_owner,
93-
log_group => $log_group,
94-
require => Package[$real_package],
93+
user => $user,
94+
group => $group,
95+
inifile => $inifile,
96+
settings => $real_settings,
97+
log_owner => $log_owner,
98+
log_group => $log_group,
99+
pool_purge => $pool_purge,
100+
require => Package[$real_package],
95101
}
96102

97103
contain 'php::fpm::config'

manifests/init.pp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
# For example, 'PHP/memory_limit' => '1000M' sets memory_limit to 1000M
124124
# for the PHP cli ini file, regardless of the values from $settings.
125125
#
126+
# [*pool_purge*]
127+
# Whether to purge pool config files not created
128+
# by this module
129+
#
126130
class php (
127131
String $ensure = $php::params::ensure,
128132
Boolean $manage_repos = $php::params::manage_repos,
@@ -157,6 +161,7 @@
157161
Boolean $ext_tool_enabled = $php::params::ext_tool_enabled,
158162
String $log_owner = $php::params::fpm_user,
159163
String $log_group = $php::params::fpm_group,
164+
Boolean $pool_purge = $php::params::pool_purge,
160165
) inherits php::params {
161166

162167
$real_fpm_package = pick($fpm_package, "${package_prefix}${php::params::fpm_package_suffix}")

manifests/params.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
$phpunit_source = 'https://phar.phpunit.de/phpunit.phar'
1414
$phpunit_path = '/usr/local/bin/phpunit'
1515
$phpunit_max_age = 30
16+
$pool_purge = false
1617

1718
case $facts['os']['family'] {
1819
'Debian': {

0 commit comments

Comments
 (0)