X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=565dcdb249d3950855da350884131191f86095dd;hb=34ffa51d586aa81dd7223483a6ab282fdd27b5b1;hp=7897c8fc4e2e21657f705beb5aa13476a92384ee;hpb=3f9280b46a05bad535d41a93f5aec968fe6c1977;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 7897c8fc..565dcdb2 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,10 +1,12 @@
 class vsftpd::site (
 	$source='',
 	$content='',
+	$bind=$::ipaddress,
 	$ensure=present
 ){
 
 	include vsftpd
+	include vsftpd::nolisten
 
 	if ($source and $content) {
 		fail ( "Can't have both source and content for $name" )
@@ -15,20 +17,30 @@ class vsftpd::site (
 		default: { fail ( "Invald ensure `$ensure' for $name" ) }
 	}
 
+	$fname = "/etc/vsftpd-${name}.conf"
+
 	if $source {
-		file { '/etc/vsftpd.conf':
+		file { $fname:
 			ensure => $ensure,
 			source => $source,
-			notify => Service['vsftpd']
 		}
 	} elsif $content {
-		file { '/etc/vsftpd.conf':
+		file { $fname:
 			ensure  => $ensure,
 			content => $content,
-			notify  => Service['vsftpd']
 		}
 	} else {
 		fail ( "Need one of source or content for $name" )
 	}
 
+	# We don't need a firewall rule because it's added in vsftp.pp
+	xinetd::service { "vsftpd-${name}":
+		bind        => $bind,
+		id          => $name,
+		server      => '/usr/sbin/vsftpd',
+		port        => 'ftp',
+		server_args => $fname,
+		ferm        => false,
+	}
+
 }