roll out to schein

[dsa-puppet.git] / modules / xinetd / manifests / service.pp

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 3dbc8cb072bd5da867856351d7dd7ae7e1c7fb83..5a70318ffae9e21d24d042983fcb6819c83f9a59 100644 (file)
--- 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,15 @@ define xinetd::service (
 ) {
        include xinetd
 
+       $noop = $::hostname ? {
+               villa    => false,
+               lobos    => false,
+               schein   => false,
+               steffani => false,
+               wieck    => false,
+               default  => true
+       }
+
        case $ensure {
                present,absent,file: {}
                default: { fail("Invalid ensure for '$name'") }
@@ -30,9 +39,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'],