X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=56126068c0289b3cc55e6e5483b1a779591c5c97;hb=6a94b204599f27a5ec786e03242b594fb51bc7fc;hp=8bdd2604908b48e81d5361d1a813c723dff80cc4;hpb=ce2faa5e2cedf0a43ecd8c01efc958fe8d2b363f;p=dsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 8bdd2604..56126068 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,22 +1,22 @@
 class roles::ftp_upload {
 
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
+	include ferm::ftp_conntrack
 
 	vsftpd::site { 'ftp-upload':
-		source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
-		bind   => $bind,
+		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 { 'security-v6':
-			source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			bind   => $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',
 		}
 	}
 }