Revert "Try to handle xinetd flags sanely"

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 231ca60..522af17 100644 (file)
--- 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,12 +20,6 @@ define xinetd::service (
 ) {
        include xinetd
 
-       $noop = $::hostname ? {
-               villa   => false,
-               lobos   => false,
-               default => true
-       }
-
        case $ensure {
                present,absent,file: {}
                default: { fail("Invalid ensure for '$name'") }
@@ -38,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'],