X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=077cb43103979bb4330f8c129bb136497eec0620;hb=a691c72453f8511a9711e63059aa2991ad0459d6;hp=d0129e1dfc42cd15f0c176a05ac5ea5180c091d7;hpb=ed3ae2a61ad25951e43b10960c82549624c43e8b;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index d0129e1d..077cb431 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,16 +1,15 @@
 define vsftpd::site (
-	$source='',
-	$content='',
+	$root,
 	$bind='',
+	$chown_user='',
+	$writable=false,
+	$banner="${name} FTP Server",
+	$max_clients=100,
 	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
 	$ensure=present
 ){
 
-	include vsftpd::nolisten
-
-	if ($source and $content) {
-		fail ( "Can't have both source and content for $name" )
-	}
+	include vsftpd
 
 	case $ensure {
 		present,absent: {}
@@ -19,23 +18,13 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	if $source {
-		file { $fname:
-			ensure => $ensure,
-			source => $source,
-		}
-	} elsif $content {
-		file { $fname:
-			ensure  => $ensure,
-			content => $content,
-		}
-	} else {
-		fail ( "Need one of source or content for $name" )
+	file { $fname:
+		ensure  => $ensure,
+		content => template('vsftpd/vsftpd.conf.erb')
 	}
 
 	file { "/etc/logrotate.d/vsftpd-${name}":
-		ensure  => $ensure,
-		content => template('vsftpd/logrotate.erb')
+		ensure => absent
 	}
 
 	# We don't need a firewall rule because it's added in vsftp.pp
@@ -46,8 +35,9 @@ define vsftpd::site (
 		port        => 'ftp',
 		server_args => $fname,
 		ferm        => false,
-		instances   => 200,
+		instances   => $max_clients,
 		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }