X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=1aee3b9d6905de82364bfc110cb425a24602a373;hb=6b3f2197570ae91174b38c04329414c5166c8d05;hp=c348579fab704e1d2d59f6ab7ad8f4743f121799;hpb=89e8467b0e9b23c4246d96068adaa665931cbec7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index c348579fa..1aee3b9d6 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,10 +19,21 @@ define xinetd::service (
 	$ensure=present,
 	$ferm=true
 ) {
-	include xinetd
-
 	case $ensure {
-		present,absent,file: {}
+		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'") }
 	}
 
@@ -37,11 +48,4 @@ define xinetd::service (
 			rule        => "&SERVICE(${protocol}, ${fermport})"
 		}
 	}
-
-	file { "/etc/xinetd.d/${name}":
-		ensure  => $ensure,
-		content => template('xinetd/service.erb'),
-		notify  => Service['xinetd'],
-		require => Package['xinetd'],
-	}
 }