roll out to steffani

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index c55d745faeba7fb6be99d302b44d59dd58d91c9b..0d9d7818a95b7610719ea3ce3df61dbee1ef5683 100644 (file)
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,22 @@
 class vsftpd::nolisten inherits vsftpd {
 
+       $noop = $::hostname ? {
+               villa    => false,
+               lobos    => false,
+               steffani => 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']
        }
 }