X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Fsite.pp;h=98cca97764bd1ac5b11d2316783df6324fb943ad;hb=9f88565cb9882258e5033b3c349a50f9732eecbd;hp=5f94751d09c4f8d53ab6bc54cca46344c11c43a9;hpb=9008713f0c6743c3fd5a0120b757f6692a563ffb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 5f94751d0..98cca9776 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,58 +1,56 @@
 define vsftpd::site (
-	$source='',
-	$content='',
+	$root,
 	$bind='',
+	$chown_user='',
+	$writable=false,
+	$writable_other=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,
-		saens    => false,
-		schein   => false,
-		steffani => false,
-		wieck    => 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}":
+		ensure => $ensure,
+		script => 'vsftpd'
+	}
+	munin::conf { "vsftpd-${name}":
+		ensure  => $ensure,
+		content => template('vsftpd/munin.erb')
 	}
 
 	# We don't need a firewall rule because it's added in vsftp.pp
 	xinetd::service { "vsftpd-${name}":
+		ensure      => $ensure,
 		bind        => $bind,
 		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
-		port        => 'ftp',
+		service     => 'ftp',
 		server_args => $fname,
 		ferm        => false,
+		instances   => $max_clients,
 		require     => File[$fname]
 	}
 
+	Service['vsftpd']->Service['xinetd']
 }