drop a bunch of noops

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index c2e5d079a9fe58cf89d494b8c4eaaa9ad5ea4ec5..78fcd008a8b5aed4979a47c599e488745a0ddebe 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,13 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
 
        Service['vsftpd'] {
                ensure => stopped,
-               noop   => true,
        }
 
+       Service['vsftpd']->Service['xinetd']
+
        file { '/etc/vsftpd.conf':
-               noop    => true,
-               content => 'listen=NO'
+               content => "listen=NO\n",
                notify  => Service['vsftpd']
        }
 }