From: Julien Cristau <jcristau@debian.org>
Date: Sun, 19 Mar 2017 11:57:59 +0000 (+0100)
Subject: Drop dead bits in ftp_upload
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0cae744c9c3932f6f1e040cb42fbe5175f9b0278;p=mirror%2Fdsa-puppet.git

Drop dead bits in ftp_upload

$bind6 was undefined since commit
b0dd1aa9d67bc92d097c1ad23f42bbedd173b756.
---

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index b553b7086..249d49e7d 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -9,14 +9,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',
-		}
-	}
 }