X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=f8a71a0fb52d9aa297949593bf0df5af0efb635a;hb=2e3464fa1aa11ebb2586271246c8d586c56d44cc;hp=2087839a897bdf833592fdfe3e634d572854ae56;hpb=63b71c4dc6db113302d78f26928e6f4dbd04aa55;p=dsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 2087839a..f8a71a0f 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,43 +1,39 @@
 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: {}
 		default: { fail ( "Invald ensure `$ensure' for $name" ) }
 	}
 
+	$ftpsite = $name
+
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	$noop = $::hostname ? {
-		villa   => false,
-		lobos   => 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 => absent
+	}
+
+	munin::check { "vsftpd-${name}":
+		script => 'vsftpd'
+	}
+	munin::conf { "vsftpd-${name}":
+		content => template('vsftpd/munin.erb')
 	}
 
 	# We don't need a firewall rule because it's added in vsftp.pp
@@ -48,6 +44,9 @@ define vsftpd::site (
 		port        => 'ftp',
 		server_args => $fname,
 		ferm        => false,
+		instances   => $max_clients,
+		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }