X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=56126068c0289b3cc55e6e5483b1a779591c5c97;hb=b8a50b04a53f45a1cbf896a91b74c32e89038da3;hp=3bccb3dbfd4ba050811908d321fcf27ea3301a27;hpb=5e67279c82e87394c04bcf2cf8ff34a35f017ef5;p=dsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 3bccb3db..56126068 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,22 @@
 class roles::ftp_upload {
+
+	include ferm::ftp_conntrack
+
 	vsftpd::site { 'ftp-upload':
-		source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf'
+		banner     => 'ftp.upload.debian.org FTP server',
+		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+		writable   => true,
+		chown_user => dak-unpriv,
+		root       => '/srv/upload.debian.org/ftp',
+	}
+
+	if $bind6 {
+		vsftpd::site { 'ftp-upload-v6':
+			banner     => 'ftp.upload.debian.org FTP server',
+			logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+			writable   => true,
+			chown_user => dak-unpriv,
+			root       => '/srv/upload.debian.org/ftp',
+		}
 	}
 }