X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fnolisten.pp;h=4a55272613bb525afb89278e420a17797f9f6c84;hb=45e86ea20c646cf8c4589cddfb0e56eb3f954d0d;hp=0bf6aaf2e09ad6ee276c6409cffb03c63bae7cb4;hpb=8b62c664936a715bfb8f8a04b73f7d9dab381d76;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0bf6aaf2e..4a5527261 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,13 +1,28 @@
-class vsftpd::nolisten {
+class vsftpd::nolisten inherits vsftpd {
+
+	$noop = $::hostname ? {
+		gluck     => false,
+		lobos     => 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']
 	}
 }