From: Bastian Blank <waldi@debian.org>
Date: Fri, 31 Mar 2017 17:57:00 +0000 (+0200)
Subject: Make sure xinetd is restarted on service removal
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ceb8ad039354390141acb803e8d1b5a5cb7d6e67;p=mirror%2Fdsa-puppet.git

Make sure xinetd is restarted on service removal
---

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 1aee3b9d6..99247614e 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,22 +19,13 @@ define xinetd::service (
 	$ensure=present,
 	$ferm=true
 ) {
-	case $ensure {
-		present,file: {
-			include xinetd
-			file { "/etc/xinetd.d/${name}":
-				ensure  => $ensure,
-				content => template('xinetd/service.erb'),
-				notify  => Service['xinetd'],
-				require => Package['xinetd'],
-			}
-		}
-		absent: {
-			file { "/etc/xinetd.d/${name}":
-				ensure  => $ensure,
-			}
-		}
-		default: { fail("Invalid ensure for '$name'") }
+	include xinetd
+
+	file { "/etc/xinetd.d/${name}":
+		ensure  => $ensure,
+		content => template('xinetd/service.erb'),
+		notify  => Service['xinetd'],
+		require => Package['xinetd'],
 	}
 
 	if $ferm {