X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=56126068c0289b3cc55e6e5483b1a779591c5c97;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=89fe6428d887fd416742e47e0677d96247cb4542;hpb=927f9ca9bed8928ea91ba1a599857c483ae4994e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 89fe6428d..56126068c 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,10 +1,12 @@
 class roles::ftp_upload {
 
+	include ferm::ftp_conntrack
+
 	vsftpd::site { 'ftp-upload':
 		banner     => 'ftp.upload.debian.org FTP server',
 		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
 		writable   => true,
-		chown_user => dak,
+		chown_user => dak-unpriv,
 		root       => '/srv/upload.debian.org/ftp',
 	}
 
@@ -13,7 +15,7 @@ class roles::ftp_upload {
 			banner     => 'ftp.upload.debian.org FTP server',
 			logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
 			writable   => true,
-			chown_user => dak,
+			chown_user => dak-unpriv,
 			root       => '/srv/upload.debian.org/ftp',
 		}
 	}