add missing sudo entry for debsources

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 07a8e58..1aee3b9 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,13 +1,16 @@
 define xinetd::service (
        $id,
        $server,
-       $port,
+       $service,
+       $port='',
        $bind='',
+       $type='',
        $socket_type=stream,
        $protocol=tcp,
-       $flags=IPv6,
+       $flags='',
        $wait=no,
        $user=root,
+       $group='',
        $server_args='',
        $nice=10,
        $instances=100,
@@ -16,42 +19,33 @@ define xinetd::service (
        $ensure=present,
        $ferm=true
 ) {
-       include xinetd
-
-       $noop = $::hostname ? {
-               bizet     => false,
-               franck    => false,
-               gluck     => false,
-               lobos     => false,
-               klecker   => false,
-               ravel     => false,
-               saens     => false,
-               santoro   => false,
-               schein    => false,
-               steffani  => false,
-               villa     => false,
-               wieck     => false,
-               morricone => false,
-               default   => true
-       }
-
        case $ensure {
-               present,absent,file: {}
+               present,file: {
+                       include xinetd
+                       file { "/etc/xinetd.d/${name}":
+                               ensure  => $ensure,
+                               content => template('xinetd/service.erb'),
+                               notify  => Service['xinetd'],
+                               require => Package['xinetd'],
+                       }
+               }
+               absent: {
+                       file { "/etc/xinetd.d/${name}":
+                               ensure  => $ensure,
+                       }
+               }
                default: { fail("Invalid ensure for '$name'") }
        }
 
        if $ferm {
-               @ferm::rule { "dsa-xinetd-${name}":
-                       description => "Allow traffic to ${port}",
-                       rule        => "&SERVICE(${protocol}, ${port})"
+               $fermport = $port ? {
+                       "" => $service,
+                       default => $port
                }
-       }
 
-       file { "/etc/xinetd.d/${name}":
-               ensure  => $ensure,
-               noop    => $noop,
-               content => template('xinetd/service.erb'),
-               notify  => Service['xinetd'],
-               require => Package['xinetd'],
+               @ferm::rule { "dsa-xinetd-${name}":
+                       description => "Allow traffic to ${service}",
+                       rule        => "&SERVICE(${protocol}, ${fermport})"
+               }
        }
 }