Note that exim contains tracker-specific configuration

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 1aee3b9..62349ea 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,22 +19,13 @@ define xinetd::service (
        $ensure=present,
        $ferm=true
 ) {
-       case $ensure {
-               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'") }
+       include xinetd
+
+       file { "/etc/xinetd.d/${name}":
+               ensure  => $ensure,
+               content => template('xinetd/service.erb'),
+               notify  => Service['xinetd'],
+               require => Package['xinetd'],
        }
 
        if $ferm {
@@ -43,7 +34,7 @@ define xinetd::service (
                        default => $port
                }
 
-               @ferm::rule { "dsa-xinetd-${name}":
+               ferm::rule { "dsa-xinetd-${name}":
                        description => "Allow traffic to ${service}",
                        rule        => "&SERVICE(${protocol}, ${fermport})"
                }