X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=1aee3b9d6905de82364bfc110cb425a24602a373;hb=28f49056591e034735a08d0a4674a64fdf7bc3a4;hp=3e594e50bd06d49c18bd5f030f1a31da97d872e8;hpb=45e86ea20c646cf8c4589cddfb0e56eb3f954d0d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 3e594e50b..1aee3b9d6 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,
@@ -16,38 +19,33 @@ define xinetd::service (
 	$ensure=present,
 	$ferm=true
 ) {
-	include xinetd
-
-	$noop = $::hostname ? {
-		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: {}
+		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'") }
 	}
 
 	if $ferm {
-		@ferm::rule { "dsa-xinetd-${name}":
-			description => "Allow traffic to ${port}",
-			rule        => "&SERVICE(${protocol}, ${port})"
+		$fermport = $port ? {
+			"" => $service,
+			default => $port
 		}
-	}
 
-	file { "/etc/xinetd.d/${name}":
-		ensure  => $ensure,
-		noop    => $noop,
-		content => template('xinetd/service.erb'),
-		notify  => Service['xinetd'],
-		require => Package['xinetd'],
+		@ferm::rule { "dsa-xinetd-${name}":
+			description => "Allow traffic to ${service}",
+			rule        => "&SERVICE(${protocol}, ${fermport})"
+		}
 	}
 }