X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fnolisten.pp;h=78fcd008a8b5aed4979a47c599e488745a0ddebe;hb=060f447f5fde318dd78e9f53b21fde9a123d476f;hp=0d9d7818a95b7610719ea3ce3df61dbee1ef5683;hpb=87bb4790fc0fe95f9cf48a40abb1f23c4e13af8a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 0d9d7818a..78fcd008a 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,21 +1,12 @@
 class vsftpd::nolisten inherits vsftpd {
 
-	$noop = $::hostname ? {
-		villa    => false,
-		lobos    => false,
-		steffani => false,
-		default  => true
-	}
-
 	Service['vsftpd'] {
 		ensure => stopped,
-		noop   => $noop,
 	}
 
 	Service['vsftpd']->Service['xinetd']
 
 	file { '/etc/vsftpd.conf':
-		noop    => $noop,
 		content => "listen=NO\n",
 		notify  => Service['vsftpd']
 	}