From 1b4d0fa921ac95c77a199ec68b660a18e77d0ff4 Mon Sep 17 00:00:00 2001 From: Pierre Hanselmann Date: Thu, 12 Feb 2015 09:15:05 +0100 Subject: [PATCH 1/2] Flags parameter is only supported on OpenBSD and breaks on some other systems like RH (on puppet 3.4.x) --- manifests/service.pp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/manifests/service.pp b/manifests/service.pp index 410259628..63b733e11 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -35,14 +35,28 @@ $service_ensure_real = $service_ensure } - service { 'nginx': - ensure => $service_ensure_real, - name => $service_name, - enable => $service_enable, - flags => $service_flags, - hasstatus => true, - hasrestart => true, + case $::osfamilly { + 'OpenBSD': { + service { 'nginx': + ensure => $service_ensure_real, + name => $service_name, + enable => $service_enable, + flags => '', + hasstatus => true, + hasrestart => true, + } + } + default: { + service { 'nginx': + ensure => $service_ensure_real, + name => $service_name, + enable => $service_enable, + hasstatus => true, + hasrestart => true, + } + } } + if $configtest_enable == true { Service['nginx'] { restart => $service_restart, From de947bea4429543de56001acf391fa3fbc0140ef Mon Sep 17 00:00:00 2001 From: Pierre Hanselmann Date: Thu, 12 Feb 2015 09:36:24 +0100 Subject: [PATCH 2/2] Fix flags parameter --- manifests/service.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/service.pp b/manifests/service.pp index 63b733e11..2cadbb44d 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -41,7 +41,7 @@ ensure => $service_ensure_real, name => $service_name, enable => $service_enable, - flags => '', + flags => $service_flags, hasstatus => true, hasrestart => true, }