X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=fc941f3b3a8d97d390d6ff0ac9061742a7c4fe5d;hb=fc12446d1c57ce8ffc3546f9a58c8e6f9cca404a;hp=e5c93b96eac0e9bbc2bf8f6b889634b8ce37afba;hpb=9af7908c4701a5ea71ae055e78490eb53b21c598;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index e5c93b96e..fc941f3b3 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,15 +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: {}
@@ -18,37 +18,14 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		franck    => false,
-		gluck     => false,
-		lobos     => false,
-		klecker   => false,
-		ravel     => false,
-		saens     => false,
-		santoro   => false,
-		schein    => false,
-		steffani  => false,
-		villa     => false,
-		wieck     => false,
-		morricone => false,
-		default   => true
+	file { $fname:
+		ensure  => $ensure,
+		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
@@ -59,7 +36,9 @@ define vsftpd::site (
 		port        => 'ftp',
 		server_args => $fname,
 		ferm        => false,
+		instances   => $max_clients,
 		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }