roll out to bizet

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0bf6aaf2e09ad6ee276c6409cffb03c63bae7cb4..ae1b0971c055c50f3b82a1ebe6c1268707b740cd 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,29 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+       $noop = $::hostname ? {
+               bizet     => false,
+               gluck     => false,
+               lobos     => false,
+               saens     => false,
+               santoro   => false,
+               schein    => false,
+               steffani  => false,
+               villa     => false,
+               wieck     => false,
+               morricone => 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']
        }
 }