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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index f7c966af6..62349ea37 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,13 +1,16 @@
 define xinetd::service (
 	$id,
 	$server,
-	$port,
+	$service,
+	$port='',
 	$bind='',
+	$type='',
 	$socket_type=stream,
 	$protocol=tcp,
-	$flags=IPv6,
+	$flags='',
 	$wait=no,
 	$user=root,
+	$group='',
 	$server_args='',
 	$nice=10,
 	$instances=100,
@@ -18,41 +21,22 @@ define xinetd::service (
 ) {
 	include xinetd
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		franck    => false,
-		gluck     => false,
-		lobos     => false,
-		kassia    => false,
-		klecker   => false,
-		ravel     => false,
-		saens     => false,
-		santoro   => false,
-		schein    => false,
-		steffani  => false,
-		villa     => false,
-		wieck     => false,
-		morricone => false,
-		default   => true
-	}
-
-	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,
-		noop    => $noop,
 		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})"
+		}
+	}
 }