X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;fp=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=f65387588631ee3ed2e2d92c34a7cd17e3f2631b;hb=6a02cbaab2c9399fb86b883037fad6e894b2d790;hp=d0129e1dfc42cd15f0c176a05ac5ea5180c091d7;hpb=fb251f849e842fe0f2cd892c15132375439bb7fd;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index d0129e1d..f6538758 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,17 +1,16 @@
 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" )
-	}
-
 	case $ensure {
 		present,absent: {}
 		default: { fail ( "Invald ensure `$ensure' for $name" ) }
@@ -19,18 +18,10 @@ 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,
+		noop    => true,
+		content => template('vsftpd/vsftpd.conf.erb')
 	}
 
 	file { "/etc/logrotate.d/vsftpd-${name}":
@@ -46,7 +37,7 @@ define vsftpd::site (
 		port        => 'ftp',
 		server_args => $fname,
 		ferm        => false,
-		instances   => 200,
+		instances   => $max_clients,
 		require     => File[$fname]
 	}