now do lobos

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index d45e867a2feb7acb505a96c47354136d4f83d3d4..231ca600aba4e538aeb93426ca39b7748be8add9 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,21 +18,27 @@ define xinetd::service (
 ) {
        include xinetd
 
+       $noop = $::hostname ? {
+               villa   => false,
+               lobos   => false,
+               default => true
+       }
+
        case $ensure {
                present,absent,file: {}
-               default: { fail("Invalid ensure for '$title'") }
+               default: { fail("Invalid ensure for '$name'") }
        }
 
        if $ferm {
-               @ferm::rule { "dsa-xinetd-${title}":
+               @ferm::rule { "dsa-xinetd-${name}":
                        description => "Allow traffic to ${port}",
                        rule        => "&SERVICE(${protocol}, ${port})"
                }
        }
 
-       file { "/etc/xinetd.d/${title}.conf":
+       file { "/etc/xinetd.d/${name}":
                ensure  => $ensure,
-               noop    => true,
+               noop    => $noop,
                content => template('xinetd/service.erb'),
                notify  => Service['xinetd'],
                require => Package['xinetd'],