From: Stephen Gran <steve@lobefin.net>
Date: Sat, 28 Apr 2012 09:10:51 +0000 (+0100)
Subject: and catch vsftp as well
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=0ce79ae5d0968def8a0a4ae1556d1e6cfb9a53d7

and catch vsftp as well

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 9347845e..9e45fba1 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,14 +1,19 @@
 class vsftpd::nolisten inherits vsftpd {
 
+	$noop = $::hostname ? {
+		villa   => false,
+		default => true
+	}
+
 	Service['vsftpd'] {
 		ensure => stopped,
-		noop   => true,
+		noop   => $noop,
 	}
 
 	Service['vsftpd']->Service['xinetd']
 
 	file { '/etc/vsftpd.conf':
-		noop    => true,
+		noop    => $noop,
 		content => "listen=NO\n",
 		notify  => Service['vsftpd']
 	}