Cannot depend on Package[xinetd] without it being defined

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

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 0f0b4a6..1aee3b9 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -22,8 +22,18 @@ define xinetd::service (
        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,
+                       }
                }
-               absent: {}
                default: { fail("Invalid ensure for '$name'") }
        }
 
@@ -38,11 +48,4 @@ define xinetd::service (
                        rule        => "&SERVICE(${protocol}, ${fermport})"
                }
        }
-
-       file { "/etc/xinetd.d/${name}":
-               ensure  => $ensure,
-               content => template('xinetd/service.erb'),
-               notify  => Service['xinetd'],
-               require => Package['xinetd'],
-       }
 }