X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fnolisten.pp;h=22951f222180748f1be921b56e3c875b2cd0caf6;hb=107a00c9b97e8ba32c823c510bbbe8b747290963;hp=c2e5d079a9fe58cf89d494b8c4eaaa9ad5ea4ec5;hpb=14939bab78c7c6231e7b13a5b0e655e934b456f0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index c2e5d079a..22951f222 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,33 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+	$noop = $::hostname ? {
+		bizet     => false,
+		franck    => false,
+		gluck     => false,
+		lobos     => false,
+		kassia    => false,
+		klecker   => false,
+		ravel     => 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']
 	}
 }