X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=56126068c0289b3cc55e6e5483b1a779591c5c97;hb=f0592778e175dd64df69a349a716fe8ca89ad66f;hp=5846d149d2405f32ffbf530b77526d5873795cc9;hpb=2ceedd3854f5be124aeb3fa003eade95af5837a5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 5846d149d..56126068c 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,28 +1,22 @@
 class roles::ftp_upload {
 
-	$bind = $::hostname ? {
-		kassia  => '::ffff:130.89.149.224',
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		kassia  => '2001:610:1908:a000:21b:78ff:fe75:3d46',
-		default => '',
-	}
-
-	$logfile = '/var/log/ftp/vsftpd-ftp.upload.debian.org.log'
+	include ferm::ftp_conntrack
 
 	vsftpd::site { 'ftp-upload':
-		content => template('roles/ftp_upload/vsftpd.conf.erb'),
-		logfile => $logfile,
-		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 { 'ftp-upload-v6':
-			content => template('roles/ftp_upload/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
+			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',
 		}
 	}
 }