Skip to content

Commit 13c261d

Browse files
committed
Fix last bits of data-types inconsistencies
These parameters had mixed types before data-types where added. Use the more appropriate data type for each of them.
1 parent d2105a0 commit 13c261d

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

manifests/fpm/pool.pp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
define php::fpm::pool (
124124
Enum['present', 'absent'] $ensure = 'present',
125125
String[1] $listen = '127.0.0.1:9000',
126-
String[1] $listen_backlog = '-1',
126+
Integer[-1] $listen_backlog = -1,
127127
Optional[String[1]] $listen_allowed_clients = undef,
128128
Optional[String[1]] $listen_owner = undef,
129129
Optional[String[1]] $listen_group = undef,
@@ -132,19 +132,19 @@
132132
String[1] $group = $php::fpm::config::group,
133133
Optional[String[1]] $apparmor_hat = undef,
134134
String[1] $pm = 'dynamic',
135-
String[1] $pm_max_children = '50',
136-
String[1] $pm_start_servers = '5',
137-
String[1] $pm_min_spare_servers = '5',
138-
String[1] $pm_max_spare_servers = '35',
139-
String[1] $pm_max_requests = '0',
135+
Integer[1] $pm_max_children = 50,
136+
Integer[1] $pm_start_servers = 5,
137+
Integer[0] $pm_min_spare_servers = 5,
138+
Integer[0] $pm_max_spare_servers = 35,
139+
Integer[0] $pm_max_requests = 0,
140140
Php::Duration $pm_process_idle_timeout = '10s',
141141
Optional[Stdlib::Absolutepath] $pm_status_path = undef,
142142
Optional[Stdlib::Absolutepath] $ping_path = undef,
143143
String[1] $ping_response = 'pong',
144144
Optional[Stdlib::Absolutepath] $access_log = undef,
145145
String[1] $access_log_format = '"%R - %u %t \"%m %r\" %s"',
146-
String[1] $request_terminate_timeout = '0',
147-
String[1] $request_slowlog_timeout = '0',
146+
Integer[0] $request_terminate_timeout = 0,
147+
Integer[0] $request_slowlog_timeout = 0,
148148
Array[String[1]] $security_limit_extensions = [],
149149
Stdlib::Absolutepath $slowlog = "/var/log/php-fpm/${name}-slow.log",
150150
String[1] $template = 'php/fpm/pool.conf.erb',

manifests/params.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
'www' => {
1919
'catch_workers_output' => 'no',
2020
'listen' => '127.0.0.1:9000',
21-
'listen_backlog' => '-1',
21+
'listen_backlog' => -1,
2222
'pm' => 'dynamic',
23-
'pm_max_children' => '50',
24-
'pm_max_requests' => '0',
25-
'pm_max_spare_servers' => '35',
26-
'pm_min_spare_servers' => '5',
27-
'pm_start_servers' => '5',
28-
'request_terminate_timeout' => '0',
23+
'pm_max_children' => 50,
24+
'pm_max_requests' => 0,
25+
'pm_max_spare_servers' => 35,
26+
'pm_min_spare_servers' => 5,
27+
'pm_start_servers' => 5,
28+
'request_terminate_timeout' => 0,
2929
},
3030
}
3131

0 commit comments

Comments
 (0)