summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Zieger <me@saz.sh>2014-05-07 11:35:35 +0200
committerSteffen Zieger <me@saz.sh>2014-05-07 11:35:35 +0200
commitb3b74b666184a7b5fd264eee4ddbff7ed55097ad (patch)
tree71aa0bd475ae635a7cb2d2fa755171824ed609aa
parent98da6b466c68559a1c574c48d92ec8de1c5a0da1 (diff)
add hasstatus and hasrestart to service
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/params.pp9
-rw-r--r--manifests/service.pp8
3 files changed, 16 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index ec988f5..f0b2cd2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -31,6 +31,8 @@ class rsyslog (
$perm_dir = $rsyslog::params::perm_dir,
$spool_dir = $rsyslog::params::spool_dir,
$service_name = $rsyslog::params::service_name,
+ $service_hasrestart = $rsyslog::params::service_hasrestart,
+ $service_hasstatus = $rsyslog::params::service_hasstatus,
$client_conf = $rsyslog::params::client_conf,
$server_conf = $rsyslog::params::server_conf,
$ssl = $rsyslog::params::ssl,
diff --git a/manifests/params.pp b/manifests/params.pp
index 4e86bff..7d2e21b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -43,6 +43,8 @@ class rsyslog::params {
'#$ModLoad immark # provides --MARK-- message capability',
]
$preserve_fqdn = false
+ $service_hasrestart = true
+ $service_hasstatus = true
}
redhat: {
if $::operatingsystem == 'Amazon' {
@@ -89,6 +91,8 @@ class rsyslog::params {
'#$ModLoad immark # provides --MARK-- message capability',
]
$preserve_fqdn = false
+ $service_hasrestart = true
+ $service_hasstatus = true
}
freebsd: {
$rsyslog_package_name = 'sysutils/rsyslog5'
@@ -120,6 +124,8 @@ class rsyslog::params {
'#$ModLoad immark # provides --MARK-- message capability',
]
$preserve_fqdn = false
+ $service_hasrestart = true
+ $service_hasstatus = true
}
default: {
@@ -153,6 +159,9 @@ class rsyslog::params {
'$ModLoad imklog # provides kernel logging support (previously done by rklogd)',
'#$ModLoad immark # provides --MARK-- message capability',
]
+ $preserve_fqdn = false
+ $service_hasrestart = true
+ $service_hasstatus = true
}
default: {
fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.")
diff --git a/manifests/service.pp b/manifests/service.pp
index 33623d1..4be1999 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -12,8 +12,10 @@
#
class rsyslog::service {
service { $rsyslog::service_name:
- ensure => running,
- enable => true,
- require => Class['rsyslog::config'],
+ ensure => running,
+ enable => true,
+ hasstatus => $rsyslog::service_hasstatus,
+ hasrestart => $rsyslog::service_hasrestart,
+ require => Class['rsyslog::config'],
}
}