X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=62349ea372a8cb3db1dc4b908a8cf0105cf03a55;hb=964f9d38eecad5a907420c5cd389fdafc4949777;hp=0f0b4a6e461136ef344b91d873224ad078d2893c;hpb=11b599633e529c3c146d23e730da0f901ddc1d45;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 0f0b4a6e4..62349ea37 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,12 +19,13 @@ define xinetd::service (
 	$ensure=present,
 	$ferm=true
 ) {
-	case $ensure {
-		present,file: {
-			include xinetd
-		}
-		absent: {}
-		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 {
@@ -33,16 +34,9 @@ define xinetd::service (
 			default => $port
 		}
 
-		@ferm::rule { "dsa-xinetd-${name}":
+		ferm::rule { "dsa-xinetd-${name}":
 			description => "Allow traffic to ${service}",
 			rule        => "&SERVICE(${protocol}, ${fermport})"
 		}
 	}
-
-	file { "/etc/xinetd.d/${name}":
-		ensure  => $ensure,
-		content => template('xinetd/service.erb'),
-		notify  => Service['xinetd'],
-		require => Package['xinetd'],
-	}
 }