X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=62349ea372a8cb3db1dc4b908a8cf0105cf03a55;hb=16f159df93f2125246d86d82d5ce4976e36ab66c;hp=2ece74c5a530957355f8cf09e67be4e176e0baff;hpb=93a102d0bd065f74e3489b7445cf400f9d779466;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 2ece74c5a..62349ea37 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -2,7 +2,7 @@ define xinetd::service (
 	$id,
 	$server,
 	$service,
-	$port=$service,
+	$port='',
 	$bind='',
 	$type='',
 	$socket_type=stream,
@@ -21,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 ${service}",
-			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})"
+		}
+	}
 }