Skip to content

Commit 8f3c667

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 6103b40 commit 8f3c667

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

manifests/service.pp

+11-18
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,36 @@
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_name = $::nginx::service_name,
20-
$service_flags = $::nginx::service_flags,
21-
$service_manage = $::nginx::service_manage,
22-
) {
23-
16+
class nginx::service {
2417
assert_private()
2518

26-
$service_enable = $service_ensure ? {
19+
$service_enable = $::nginx::service_ensure ? {
2720
'running' => true,
2821
'absent' => false,
2922
'stopped' => false,
3023
'undef' => undef,
3124
default => true,
3225
}
3326

34-
if $service_ensure == 'undef' {
27+
if $::nginx::service_ensure == 'undef' {
3528
$service_ensure_real = undef
3629
} else {
37-
$service_ensure_real = $service_ensure
30+
$service_ensure_real = $::nginx::service_ensure
3831
}
3932

40-
if $service_manage {
33+
if $::nginx::service_manage {
4134
case $facts['os']['name'] {
4235
'OpenBSD': {
43-
service { $service_name:
36+
service { $::nginx::service_name:
4437
ensure => $service_ensure_real,
4538
enable => $service_enable,
46-
flags => $service_flags,
39+
flags => $::nginx::service_flags,
4740
hasstatus => true,
4841
hasrestart => true,
4942
}
5043
}
5144
default: {
52-
service { $service_name:
45+
service { $::nginx::service_name:
5346
ensure => $service_ensure_real,
5447
enable => $service_enable,
5548
hasstatus => true,
@@ -60,9 +53,9 @@
6053
}
6154

6255
# Allow overriding of 'restart' of Service resource; not used by default
63-
if $service_restart {
64-
Service[$service_name] {
65-
restart => $service_restart,
56+
if $::nginx::service_restart {
57+
Service[$::nginx::service_name] {
58+
restart => $::nginx::service_restart,
6659
}
6760
}
6861
}

0 commit comments

Comments
 (0)