X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=39e40d7c0d98cf72864778b262a2b0dc4abc64a9;hb=e3bebd85cddff77d74c2015315f1baf2d2977ed2;hp=b553b70865283561a79ae2a15093c6c13a5bece4;hpb=0aa995655b6a58e2c9418845c50d42e6565c9c7b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index b553b7086..39e40d7c0 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,7 +1,4 @@
 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',
@@ -9,14 +6,4 @@ class roles::ftp_upload {
 		chown_user => dak-unpriv,
 		root       => '/srv/upload.debian.org/ftp',
 	}
-
-	if $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',
-		}
-	}
 }