X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=682d314ced526158c53d107c7d9b35d20e534839;hb=bfd5edbf62766dcaf560453c39096fa553801cce;hp=bf6e16fd14a6c75a983faa15918229f93d7684e1;hpb=3bdba330fd5120b6a8e2f624d5ba72d08ded558c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index bf6e16fd1..682d314ce 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,26 +1,32 @@
 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'
-
 	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,
+		bind       => $bind,
+		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,
+			bind       => $bind6,
+			root       => '/srv/upload.debian.org/ftp',
 		}
 	}
 }