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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 7001455c..d0129e1d 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -2,6 +2,7 @@ define vsftpd::site (
 	$source='',
 	$content='',
 	$bind='',
+	$logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
 	$ensure=present
 ){
 
@@ -18,35 +19,35 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	$noop = $::hostname ? {
-		villa   => false,
-		default => true
-	}
-
 	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   => 200,
+		require     => File[$fname]
 	}
 
 }