X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=522af17c4c83c5a749eecd2a52618886c94b1eae;hb=1a4f81b1bc574b83ea25e0f87d0bedc4ff9029a7;hp=fc6460ccbb8983df29f5eea69d6c1840307a0a4e;hpb=99187cfac5f261c31f72424efc69940c3f520dca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index fc6460ccb..522af17c4 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -3,11 +3,13 @@ define xinetd::service (
 	$server,
 	$port,
 	$bind='',
+	$type='',
 	$socket_type=stream,
 	$protocol=tcp,
 	$flags=IPv6,
 	$wait=no,
 	$user=root,
+	$group='',
 	$server_args='',
 	$nice=10,
 	$instances=100,
@@ -18,17 +20,6 @@ define xinetd::service (
 ) {
 	include xinetd
 
-	$noop = $::hostname ? {
-		villa    => false,
-		lobos    => false,
-		saens    => false,
-		santoro  => false,
-		schein   => false,
-		steffani => false,
-		wieck    => false,
-		default  => true
-	}
-
 	case $ensure {
 		present,absent,file: {}
 		default: { fail("Invalid ensure for '$name'") }
@@ -43,7 +34,6 @@ define xinetd::service (
 
 	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
-		noop    => $noop,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],