X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvsftpd%2Fmanifests%2Fnolisten.pp;h=3068a5194b174dd12e208d5efe3a17bde648eccc;hb=3f1824fad8effe2513df0db7d9ac291c707063e0;hp=38e6d8cce4d0b03f162a012f2032be72a4195abf;hpb=34ffa51d586aa81dd7223483a6ab282fdd27b5b1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 38e6d8cce..3068a5194 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,11 +1,23 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+	$noop = $::hostname ? {
+		villa    => false,
+		lobos    => false,
+		steffani => false,
+		wieck    => 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']
 	}
 }