From 73fa8662bb6a2bbf894ebee9f4c5111eba49b4ae Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 24 May 2013 16:55:59 +0200 Subject: [PATCH 1/3] use $::osfamily (RHEL compatibility) --- manifests/params.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index b869f2c..2309e5d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -43,12 +43,12 @@ #### Internal module values # packages - case $::operatingsystem { - 'CentOS', 'Fedora', 'Scientific': { + case $::osfamily { + 'RedHat': { # main application $package = [ 'lumberjack' ] } - 'Debian', 'Ubuntu': { + 'Debian': { # main application $package = [ 'lumberjack' ] } @@ -59,14 +59,14 @@ } # service parameters - case $::operatingsystem { - 'CentOS', 'Fedora', 'Scientific': { + case $::osfamily { + 'RedHat': { $service_name = 'lumberjack' $service_hasrestart = true $service_hasstatus = true $service_pattern = $service_name } - 'Debian', 'Ubuntu': { + 'Debian': { $service_name = 'lumberjack' $service_hasrestart = true $service_hasstatus = true From c528a52995f8ca452299051ed74e51d6910ba875 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 24 May 2013 17:11:56 +0200 Subject: [PATCH 2/3] configuration changes must notify service --- manifests/init.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6f06609..bc2ebc3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -150,7 +150,13 @@ # we need the software before running a service Class['lumberjack::package'] -> Class['lumberjack::config'] - Class['lumberjack::config'] -> Class['lumberjack::service'] + # make sure configuration changes properly restart the daemon + if ($status in [ 'enabled', 'running' ]) { + Class['lumberjack::config'] ~> Class['lumberjack::service'] + } else { + Class['lumberjack::config'] -> Class['lumberjack::service'] + } + Class['lumberjack::package'] -> Class['lumberjack::service'] } else { From 6fa11b1dea15f612b95bcf94db631a6da06766dd Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 24 May 2013 17:14:40 +0200 Subject: [PATCH 3/3] remove implicit dependency --- manifests/init.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bc2ebc3..27eefd6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -157,8 +157,6 @@ Class['lumberjack::config'] -> Class['lumberjack::service'] } - Class['lumberjack::package'] -> Class['lumberjack::service'] - } else { # make sure all services are getting stopped before software removal