X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fnolisten.pp;h=9491e06177e4eb7a0ce125d42727b45e0a7b461e;hb=9008713f0c6743c3fd5a0120b757f6692a563ffb;hp=0bf6aaf2e09ad6ee276c6409cffb03c63bae7cb4;hpb=8b62c664936a715bfb8f8a04b73f7d9dab381d76;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0bf6aaf2..9491e061 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +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,
-		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']
 	}
 }