eximconf: re-order checks to avoid unnecessary DNS lookups

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index c348579..62349ea 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -21,9 +21,11 @@ define xinetd::service (
 ) {
        include xinetd
 
-       case $ensure {
-               present,absent,file: {}
-               default: { fail("Invalid ensure for '$name'") }
+       file { "/etc/xinetd.d/${name}":
+               ensure  => $ensure,
+               content => template('xinetd/service.erb'),
+               notify  => Service['xinetd'],
+               require => Package['xinetd'],
        }
 
        if $ferm {
@@ -32,16 +34,9 @@ define xinetd::service (
                        default => $port
                }
 
-               @ferm::rule { "dsa-xinetd-${name}":
+               ferm::rule { "dsa-xinetd-${name}":
                        description => "Allow traffic to ${service}",
                        rule        => "&SERVICE(${protocol}, ${fermport})"
                }
        }
-
-       file { "/etc/xinetd.d/${name}":
-               ensure  => $ensure,
-               content => template('xinetd/service.erb'),
-               notify  => Service['xinetd'],
-               require => Package['xinetd'],
-       }
 }