and catch vsftp as well

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0bf6aaf2e09ad6ee276c6409cffb03c63bae7cb4..9e45fba1d2c023eb77901bc738a9953c8bbb16da 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,20 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+       $noop = $::hostname ? {
+               villa   => false,
+               default => true
+       }
 
        Service['vsftpd'] {
                ensure => stopped,
-               noop   => true,
+               noop   => $noop,
        }
 
+       Service['vsftpd']->Service['xinetd']
+
        file { '/etc/vsftpd.conf':
-               noop    => true,
-               content => 'listen=NO',
+               noop    => $noop,
+               content => "listen=NO\n",
                notify  => Service['vsftpd']
        }
 }