X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Fmanifests%2Fservice.pp;h=5ea4e8d3d84a9d79f55c3242624a5a0d58974d88;hb=f4d6d9b163364d2f3f87efd01040f568fc0afa35;hp=3dbc8cb072bd5da867856351d7dd7ae7e1c7fb83;hpb=14939bab78c7c6231e7b13a5b0e655e934b456f0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 3dbc8cb07..5ea4e8d3d 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,8 +1,8 @@
 define xinetd::service (
-	$bind,
 	$id,
 	$server,
 	$port,
+	$bind='',
 	$socket_type=stream,
 	$protocol=tcp,
 	$flags=IPv6,
@@ -18,6 +18,11 @@ define xinetd::service (
 ) {
 	include xinetd
 
+	$noop = $::hostname ? {
+		villa   => false,
+		default => true
+	}
+
 	case $ensure {
 		present,absent,file: {}
 		default: { fail("Invalid ensure for '$name'") }
@@ -30,9 +35,9 @@ define xinetd::service (
 		}
 	}
 
-	file { "/etc/xinetd.d/${name}.conf":
+	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
-		noop    => true,
+		noop    => $noop,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],