s/name/title/ in a few places

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 565dcdb249d3950855da350884131191f86095dd..3f1deeb7c962a56c578ae5781bbfac416570b14e 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 {
@@ -34,7 +35,7 @@ class vsftpd::site (
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
-       xinetd::service { "vsftpd-${name}":
+       xinetd::service { "vsftpd-${title}":
                bind        => $bind,
                id          => $name,
                server      => '/usr/sbin/vsftpd',