fix up inheritance

[dsa-puppet.git] / modules / vsftpd / manifests / site.pp

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 565dcdb249d3950855da350884131191f86095dd..efacf705d4dcb2a7f53baa6a17b6839c2dc347ab 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -5,7 +5,6 @@ class vsftpd::site (
        $ensure=present
 ){
 
-       include vsftpd
        include vsftpd::nolisten
 
        if ($source and $content) {
@@ -22,11 +21,13 @@ class vsftpd::site (
        if $source {
                file { $fname:
                        ensure => $ensure,
+                       noop   => true,
                        source => $source,
                }
        } elsif $content {
                file { $fname:
                        ensure  => $ensure,
+                       noop    => true,
                        content => $content,
                }
        } else {