eximconf: migrate from CDB to BDB for ud-ldap generated files (RT#4648)

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 2ece74c..62349ea 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -2,7 +2,7 @@ define xinetd::service (
        $id,
        $server,
        $service,
-       $port=$service,
+       $port='',
        $bind='',
        $type='',
        $socket_type=stream,
@@ -21,22 +21,22 @@ define xinetd::service (
 ) {
        include xinetd
 
-       case $ensure {
-               present,absent,file: {}
-               default: { fail("Invalid ensure for '$name'") }
-       }
-
-       if $ferm {
-               @ferm::rule { "dsa-xinetd-${name}":
-                       description => "Allow traffic to ${service}",
-                       rule        => "&SERVICE(${protocol}, ${port})"
-               }
-       }
-
        file { "/etc/xinetd.d/${name}":
                ensure  => $ensure,
                content => template('xinetd/service.erb'),
                notify  => Service['xinetd'],
                require => Package['xinetd'],
        }
+
+       if $ferm {
+               $fermport = $port ? {
+                       "" => $service,
+                       default => $port
+               }
+
+               ferm::rule { "dsa-xinetd-${name}":
+                       description => "Allow traffic to ${service}",
+                       rule        => "&SERVICE(${protocol}, ${fermport})"
+               }
+       }
 }