X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=4608f6d5ded616425cc5e6543d9e97174e14341a;hb=a84f32b02244c18130bc32f6b410367af2c07279;hp=9b9ec2d2fa1157d06a67dd60fe23034ef51e3039;hpb=a8faece43f89960c6686321309b3082c7a531cac;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9b9ec2d2f..4608f6d5d 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -2,10 +2,13 @@ class roles::security_mirror {
 
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+		source => 'puppet:///modules/roles/security_mirror/security.debian.org'
 	}
 
-	class { 'vsftpd::site':
-		source => 'puppet:///modules/roles/security_mirror/vsftpd.conf'
+	vsftpd::site { 'security':
+		banner       => 'security.debian.org FTP server (vsftpd)',
+		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
+		max_clients  => 200,
+		root         => '/srv/ftp.root/',
 	}
 }