X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=99247614ee3caa8a9084546632705f0b8b3791d6;hb=e550ca4aeaed6e29598901326f3d707631fa1402;hp=5c8f954ad340594cdf747ff1aa6b4cef95245e71;hpb=aae8b555c902a217d68dc96ccd50ae6144e8e686;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 5c8f954ad..99247614e 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,7 +1,8 @@
 define xinetd::service (
 	$id,
 	$server,
-	$port,
+	$service,
+	$port='',
 	$bind='',
 	$type='',
 	$socket_type=stream,
@@ -20,22 +21,22 @@ define xinetd::service (
 ) {
 	include xinetd
 
-	case $ensure {
-		present,absent,file: {}
-		default: { fail("Invalid ensure for '$name'") }
-	}
-
-	if $ferm {
-		@ferm::rule { "dsa-xinetd-${name}":
-			description => "Allow traffic to ${port}",
-			rule        => "&SERVICE(${protocol}, ${port})"
-		}
-	}
-
 	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],
 	}
+
+	if $ferm {
+		$fermport = $port ? {
+			"" => $service,
+			default => $port
+		}
+
+		@ferm::rule { "dsa-xinetd-${name}":
+			description => "Allow traffic to ${service}",
+			rule        => "&SERVICE(${protocol}, ${fermport})"
+		}
+	}
 }