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

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 682d314c..56126068 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,21 +1,12 @@
 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 => '',
-	}
+	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,
-		bind       => $bind,
+		chown_user => dak-unpriv,
 		root       => '/srv/upload.debian.org/ftp',
 	}
 
@@ -24,8 +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,
-			bind       => $bind6,
+			chown_user => dak-unpriv,
 			root       => '/srv/upload.debian.org/ftp',
 		}
 	}