Skip to content

Commit f24f218

Browse files
author
Taylan Develioglu
committed
Remove unnecessary class parameters from nginx::service
Class `nginx::service` is private, declared once and should reference variables only from the main class.
1 parent df5a2dd commit f24f218

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

manifests/service.pp

+12-19
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,25 @@
1313
# Sample Usage:
1414
#
1515
# This class file is not called directly
16-
class nginx::service(
17-
$service_restart = $nginx::service_restart,
18-
$service_ensure = $nginx::service_ensure,
19-
$service_enable = $nginx::service_enable,
20-
$service_name = $nginx::service_name,
21-
$service_flags = $nginx::service_flags,
22-
$service_manage = $nginx::service_manage,
23-
) {
16+
class nginx::service {
2417

2518
assert_private()
2619

27-
if $service_manage {
20+
if $nginx::service_manage {
2821
case $facts['os']['name'] {
2922
'OpenBSD': {
30-
service { $service_name:
31-
ensure => $service_ensure,
32-
enable => $service_enable,
33-
flags => $service_flags,
23+
service { $nginx::service_name:
24+
ensure => $nginx::service_ensure,
25+
enable => $nginx::service_enable,
26+
flags => $nginx::service_flags,
3427
hasstatus => true,
3528
hasrestart => true,
3629
}
3730
}
3831
default: {
39-
service { $service_name:
40-
ensure => $service_ensure,
41-
enable => $service_enable,
32+
service { $nginx::service_name:
33+
ensure => $nginx::service_ensure,
34+
enable => $nginx::service_enable,
4235
hasstatus => true,
4336
hasrestart => true,
4437
}
@@ -47,9 +40,9 @@
4740
}
4841

4942
# Allow overriding of 'restart' of Service resource; not used by default
50-
if $service_restart {
51-
Service[$service_name] {
52-
restart => $service_restart,
43+
if $nginx::service_restart {
44+
Service[$nginx::service_name] {
45+
restart => $nginx::service_restart,
5346
}
5447
}
5548
}

0 commit comments

Comments
 (0)