X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=fc941f3b3a8d97d390d6ff0ac9061742a7c4fe5d;hb=14060b9077bf8934a0670e00bec6068f714e28e2;hp=f65387588631ee3ed2e2d92c34a7cd17e3f2631b;hpb=6a02cbaab2c9399fb86b883037fad6e894b2d790;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index f65387588..fc941f3b3 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -9,7 +9,7 @@ define vsftpd::site (
 	$ensure=present
 ){
 
-	include vsftpd::nolisten
+	include vsftpd
 
 	case $ensure {
 		present,absent: {}
@@ -20,7 +20,6 @@ define vsftpd::site (
 
 	file { $fname:
 		ensure  => $ensure,
-		noop    => true,
 		content => template('vsftpd/vsftpd.conf.erb')
 	}
 
@@ -41,4 +40,5 @@ define vsftpd::site (
 		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }