roll out to klecker

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 38e6d8cce4d0b03f162a012f2032be72a4195abf..64f6dc24764b3341e50c315476681f5716e79f59 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,11 +1,32 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+       $noop = $::hostname ? {
+               bizet     => false,
+               franck    => false,
+               gluck     => false,
+               lobos     => false,
+               klecker   => false,
+               ravel     => false,
+               saens     => false,
+               santoro   => false,
+               schein    => false,
+               steffani  => false,
+               villa     => false,
+               wieck     => false,
+               morricone => 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']
        }
 }