Merge remote-tracking branch 'waldi/keyring-ssl'

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 2ad6338..c348579 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,13 +1,16 @@
 define xinetd::service (
-       $bind,
        $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,
@@ -24,13 +27,18 @@ define xinetd::service (
        }
 
        if $ferm {
+               $fermport = $port ? {
+                       "" => $service,
+                       default => $port
+               }
+
                @ferm::rule { "dsa-xinetd-${name}":
-                       description => "Allow traffic to ${port}",
-                       rule        => "&SERVICE(${protocol}, ${port})"
+                       description => "Allow traffic to ${service}",
+                       rule        => "&SERVICE(${protocol}, ${fermport})"
                }
        }
 
-       file { "/etc/xinetd.d/${name}.conf":
+       file { "/etc/xinetd.d/${name}":
                ensure  => $ensure,
                content => template('xinetd/service.erb'),
                notify  => Service['xinetd'],