roll out to saens

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 38e6d8cce4d0b03f162a012f2032be72a4195abf..9491e06177e4eb7a0ce125d42727b45e0a7b461e 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,11 +1,25 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+       $noop = $::hostname ? {
+               villa    => false,
+               lobos    => false,
+               saens    => false,
+               schein   => false,
+               steffani => false,
+               wieck    => false,
+               default  => true
+       }
 
        Service['vsftpd'] {
-               ensure => stopped
+               ensure => stopped,
+               noop   => $noop,
        }
 
+       Service['vsftpd']->Service['xinetd']
+
        file { '/etc/vsftpd.conf':
-               content => 'listen=NO'
+               noop    => $noop,
+               content => "listen=NO\n",
                notify  => Service['vsftpd']
        }
 }