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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index cf438119d..c348579fa 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,35 +21,25 @@ define xinetd::service (
 ) {
 	include xinetd
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		gluck     => false,
-		lobos     => 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 {
+		$fermport = $port ? {
+			"" => $service,
+			default => $port
+		}
+
 		@ferm::rule { "dsa-xinetd-${name}":
-			description => "Allow traffic to ${port}",
-			rule        => "&SERVICE(${protocol}, ${port})"
+			description => "Allow traffic to ${service}",
+			rule        => "&SERVICE(${protocol}, ${fermport})"
 		}
 	}
 
 	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
-		noop    => $noop,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],