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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 7001455c8..f65387588 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,16 +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" ) }
@@ -18,35 +18,27 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	$noop = $::hostname ? {
-		villa   => false,
-		default => true
+	file { $fname:
+		ensure  => $ensure,
+		noop    => true,
+		content => template('vsftpd/vsftpd.conf.erb')
 	}
 
-	if $source {
-		file { $fname:
-			ensure => $ensure,
-			noop   => $noop,
-			source => $source,
-		}
-	} elsif $content {
-		file { $fname:
-			ensure  => $ensure,
-			noop    => $noop,
-			content => $content,
-		}
-	} else {
-		fail ( "Need one of source or content for $name" )
+	file { "/etc/logrotate.d/vsftpd-${name}":
+		ensure  => $ensure,
+		content => template('vsftpd/logrotate.erb')
 	}
 
 	# We don't need a firewall rule because it's added in vsftp.pp
 	xinetd::service { "vsftpd-${name}":
 		bind        => $bind,
-		id          => $name,
+		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
 		port        => 'ftp',
 		server_args => $fname,
 		ferm        => false,
+		instances   => $max_clients,
+		require     => File[$fname]
 	}
 
 }